From 476a93f55481e202f18084f8f59ac073ef6ee3a8 Mon Sep 17 00:00:00 2001
From: Chris Pulman <chris.pulman@yahoo.com>
Date: Mon, 27 May 2024 07:58:41 +0100
Subject: [PATCH] Housekeeping Retire Xamarin (#788)

* Housekeeping Retire Xamarin

* Update Samples

* Update UPI

* Use DotNet Build

* Add Runtime Identifier

* Update Sample RuntimeIdentifier

* Update SextantSample.Maui.csproj

* Update SextantSample.Maui.csproj

* Update solution

* Update build-samples.yml

* Revert to Sln as Slnx is not enabled in cloud build

* Update build-samples.yml
---
 .editorconfig                                 |  88 +++-
 .github/workflows/build-samples.yml           |   1 +
 .github/workflows/ci-build.yml                |   1 +
 .github/workflows/release.yml                 |   1 +
 Archive/SextantSample.Android.zip             |   3 +
 Archive/SextantSample.UWP.zip                 |   3 +
 Archive/SextantSample.WPF.zip                 |   3 +
 Archive/SextantSample.iOS.zip                 |   3 +
 Archive/SextantSample.zip                     |   3 +
 Samples/SextantSample.Maui/App.xaml           |  14 +
 Samples/SextantSample.Maui/App.xaml.cs        |  19 +
 Samples/SextantSample.Maui/AppShell.xaml      |  15 +
 Samples/SextantSample.Maui/AppShell.xaml.cs   |  10 +
 .../SextantSample.Maui/GlobalUsings.cs        |   0
 Samples/SextantSample.Maui/MainPage.xaml      |  36 ++
 Samples/SextantSample.Maui/MainPage.xaml.cs   |  25 ++
 Samples/SextantSample.Maui/MauiProgram.cs     |  38 ++
 .../Platforms/Android/AndroidManifest.xml     |   4 +-
 .../Platforms/Android/MainActivity.cs         |  11 +
 .../Platforms/Android/MainApplication.cs      |  16 +
 .../Android/Resources/values/colors.xml       |   0
 .../Platforms/MacCatalyst/AppDelegate.cs      |  10 +
 .../Platforms/MacCatalyst/Entitlements.plist  |  14 +
 .../Platforms/MacCatalyst}/Info.plist         |  14 +-
 .../Platforms/MacCatalyst/Program.cs          |  10 +
 .../Platforms/Tizen/Main.cs                   |  17 +
 .../Platforms/Tizen/tizen-manifest.xml        |  15 +
 .../Platforms/Windows/App.xaml                |   0
 .../Platforms/Windows/App.xaml.cs             |  25 ++
 .../Platforms/Windows/Package.appxmanifest    |  24 +-
 .../Platforms/Windows/app.manifest            |   0
 .../Platforms/iOS/AppDelegate.cs              |  10 +
 .../Platforms/iOS}/Info.plist                 |   2 +
 .../Platforms/iOS/Program.cs                  |  10 +
 .../Properties/launchSettings.json            |   0
 .../Resources/AppIcon/appicon.svg             |   0
 .../Resources/AppIcon/appiconfg.svg           |   0
 .../Resources/Fonts/OpenSans-Regular.ttf      |   3 +
 .../Resources/Fonts/OpenSans-Semibold.ttf     |   3 +
 .../Resources/Images/dotnet_bot.png           |   3 +
 .../Resources/Raw/AboutAssets.txt             |   2 +-
 .../Resources/Splash/splash.svg               |   0
 .../Resources/Styles/Colors.xaml              |  23 +-
 .../Resources/Styles/Styles.xaml              |  45 +-
 .../SextantSample.Maui.csproj                 |  64 +++
 .../Views/BlueNavigationView.cs               |   0
 .../Views/FirstModalView.xaml                 |   0
 .../Views/FirstModalView.xaml.cs              |   0
 .../SextantSample.Maui/Views/GreenView.xaml   |   0
 .../Views/GreenView.xaml.cs                   |   0
 .../SextantSample.Maui/Views/HomeView.xaml    |   0
 .../SextantSample.Maui/Views/HomeView.xaml.cs |   0
 .../SextantSample.Maui/Views/RedView.xaml     |   0
 .../SextantSample.Maui/Views/RedView.xaml.cs  |   0
 .../Views/SecondModalView.xaml                |   0
 .../Views/SecondModalView.xaml.cs             |   0
 src/Directory.Packages.props                  |  21 +-
 src/Directory.build.props                     |   9 +-
 src/Directory.build.targets                   |  59 +--
 .../Assets/AboutAssets.txt                    |  19 -
 .../SextantSample.Android/MainActivity.cs     |  22 -
 .../Properties/AndroidManifest.xml            |   5 -
 .../Properties/AssemblyInfo.cs                |  34 --
 .../Resources/AboutResources.txt              |  50 ---
 .../Resources/drawable/xamarin_logo.png       |   3 -
 .../Resources/layout/Tabbar.axml              |  12 -
 .../Resources/layout/Toolbar.axml             |   9 -
 .../Resources/mipmap-anydpi-v26/icon.xml      |   5 -
 .../mipmap-anydpi-v26/icon_round.xml          |   5 -
 .../Resources/mipmap-hdpi/Icon.png            |   3 -
 .../mipmap-hdpi/launcher_foreground.png       |   3 -
 .../Resources/mipmap-mdpi/icon.png            |   3 -
 .../mipmap-mdpi/launcher_foreground.png       |   3 -
 .../Resources/mipmap-xhdpi/Icon.png           |   3 -
 .../mipmap-xhdpi/launcher_foreground.png      |   3 -
 .../Resources/mipmap-xxhdpi/Icon.png          |   3 -
 .../mipmap-xxhdpi/launcher_foreground.png     |   3 -
 .../Resources/mipmap-xxxhdpi/Icon.png         |   3 -
 .../mipmap-xxxhdpi/launcher_foreground.png    |   3 -
 .../Resources/values/colors.xml               |   7 -
 .../Resources/values/styles.xml               |  26 --
 .../Resources/xml/file_paths.xml              |   5 -
 .../SextantSample.Android.csproj              | 148 -------
 src/Sample/SextantSample.Avalonia.sln         |  64 ---
 src/Sample/SextantSample.Avalonia/App.xaml.cs |  23 +-
 .../FirstModalNavigationViewModel.cs          |   2 +-
 .../SextantSample.Core/FirstModalViewModel.cs |   8 +-
 .../SextantSample.Core/GreenViewModel.cs      |   8 +-
 .../HomeNavigationViewModel.cs                |   2 +-
 .../SextantSample.Core/HomeViewModel.cs       |   8 +-
 src/Sample/SextantSample.Core/RedViewModel.cs |  10 +-
 .../SecondModalNavigationViewModel.cs         |   2 +-
 .../SecondModalViewModel.cs                   |   6 +-
 .../SextantSample.ViewModels.csproj           |   7 +-
 .../SextantSample.Core/ViewModelBase.cs       |  10 +-
 src/Sample/SextantSample.Maui/App.xaml        |  11 -
 src/Sample/SextantSample.Maui/App.xaml.cs     |  19 -
 src/Sample/SextantSample.Maui/MauiProgram.cs  |  39 --
 .../Platforms/Android/MainActivity.cs         |  36 --
 .../Platforms/Android/MainApplication.cs      |  15 -
 .../Platforms/MacCatalyst/AppDelegate.cs      |   9 -
 .../Platforms/MacCatalyst/Program.cs          |  14 -
 .../Platforms/Windows/App.xaml.cs             |  21 -
 .../Platforms/iOS/AppDelegate.cs              |   9 -
 .../Platforms/iOS/Program.cs                  |  14 -
 .../Platforms/iOS/Resources/LaunchScreen.xib  |  43 --
 .../Resources/Fonts/OpenSans-Regular.ttf      |   3 -
 .../Resources/Fonts/OpenSans-Semibold.ttf     |   3 -
 .../Resources/Images/dotnet_bot.svg           |  93 ----
 .../SextantSample.Maui.csproj                 |  88 ----
 src/Sample/SextantSample.UWP/App.xaml         |   7 -
 src/Sample/SextantSample.UWP/App.xaml.cs      | 128 ------
 .../Assets/LockScreenLogo.scale-200.png       |   3 -
 .../Assets/SplashScreen.scale-200.png         |   3 -
 .../Assets/Square150x150Logo.scale-200.png    |   3 -
 .../Assets/Square44x44Logo.scale-200.png      |   3 -
 ...x44Logo.targetsize-24_altform-unplated.png |   3 -
 .../SextantSample.UWP/Assets/StoreLogo.png    |   3 -
 .../Assets/Wide310x150Logo.scale-200.png      |   3 -
 .../SextantSample.UWP/Package.appxmanifest    |  49 ---
 .../Properties/AssemblyInfo.cs                |  29 --
 .../Properties/Default.rd.xml                 |  31 --
 .../SextantDefaultExceptionHandler.cs         |  35 --
 .../SextantSample.UWP.csproj                  | 213 ---------
 .../Views/BlueNavigationView.cs               |  23 -
 .../Views/FirstModalView.xaml                 |  19 -
 .../Views/FirstModalView.xaml.cs              |  42 --
 .../SextantSample.UWP/Views/GreenView.xaml    |  21 -
 .../SextantSample.UWP/Views/GreenView.xaml.cs |  28 --
 .../SextantSample.UWP/Views/HomeView.xaml     |  21 -
 .../SextantSample.UWP/Views/HomeView.xaml.cs  |  29 --
 .../SextantSample.UWP/Views/RedView.xaml      |  25 --
 .../SextantSample.UWP/Views/RedView.xaml.cs   |  42 --
 .../Views/SecondModalView.xaml                |  19 -
 .../Views/SecondModalView.xaml.cs             |  42 --
 src/Sample/SextantSample.WPF/App.xaml         |   5 -
 src/Sample/SextantSample.WPF/App.xaml.cs      |  12 -
 src/Sample/SextantSample.WPF/AssemblyInfo.cs  |   8 -
 src/Sample/SextantSample.WPF/MainWindow.xaml  |  11 -
 .../SextantSample.WPF/MainWindow.xaml.cs      |  27 --
 .../SextantSample.WPF.csproj                  |  19 -
 src/Sample/SextantSample.iOS/AppDelegate.cs   |  29 --
 .../AppIcon.appiconset/Contents.json          | 117 -----
 .../AppIcon.appiconset/Icon1024.png           |   3 -
 .../AppIcon.appiconset/Icon120.png            |   3 -
 .../AppIcon.appiconset/Icon152.png            |   3 -
 .../AppIcon.appiconset/Icon167.png            |   3 -
 .../AppIcon.appiconset/Icon180.png            |   3 -
 .../AppIcon.appiconset/Icon20.png             |   3 -
 .../AppIcon.appiconset/Icon29.png             |   3 -
 .../AppIcon.appiconset/Icon40.png             |   3 -
 .../AppIcon.appiconset/Icon58.png             |   3 -
 .../AppIcon.appiconset/Icon60.png             |   3 -
 .../AppIcon.appiconset/Icon76.png             |   3 -
 .../AppIcon.appiconset/Icon80.png             |   3 -
 .../AppIcon.appiconset/Icon87.png             |   3 -
 .../SextantSample.iOS/Entitlements.plist      |   7 -
 src/Sample/SextantSample.iOS/Info.plist       |  38 --
 src/Sample/SextantSample.iOS/Main.cs          |  15 -
 .../Properties/AssemblyInfo.cs                |  35 --
 .../Resources/Default-568h@2x.png             |   3 -
 .../Resources/Default-Portrait.png            |   3 -
 .../Resources/Default-Portrait@2x.png         |   3 -
 .../SextantSample.iOS/Resources/Default.png   |   3 -
 .../Resources/Default@2x.png                  |   3 -
 .../Resources/LaunchScreen.storyboard         |  39 --
 .../SextantSample.iOS.csproj                  | 219 ----------
 src/Sample/SextantSample.sln                  | 317 ++------------
 src/Sample/SextantSample/App.xaml             |   5 -
 src/Sample/SextantSample/App.xaml.cs          |  86 ----
 src/Sample/SextantSample/SextantSample.csproj |  20 -
 .../SextantSample/Views/BlueNavigationView.cs |  38 --
 .../SextantSample/Views/FirstModalView.xaml   |  15 -
 .../Views/FirstModalView.xaml.cs              |  34 --
 src/Sample/SextantSample/Views/GreenView.xaml |  15 -
 .../SextantSample/Views/GreenView.xaml.cs     |  29 --
 src/Sample/SextantSample/Views/HomeView.xaml  |  16 -
 .../SextantSample/Views/HomeView.xaml.cs      |  41 --
 src/Sample/SextantSample/Views/RedView.xaml   |  17 -
 .../SextantSample/Views/RedView.xaml.cs       |  36 --
 .../SextantSample/Views/SecondModalView.xaml  |  15 -
 .../Views/SecondModalView.xaml.cs             |  33 --
 .../DependencyResolverMixins.cs               |   5 +
 src/Sextant.Avalonia/NavigationView.cs        |  10 +
 src/Sextant.Avalonia/Sextant.Avalonia.csproj  |   8 +-
 src/Sextant.Maui/NavigationView.cs            |   2 +-
 src/Sextant.Maui/Sextant.Maui.csproj          |  18 +-
 src/Sextant.Mocks/Sextant.Mocks.csproj        |   6 +-
 .../IPopupViewStackService.cs                 | 162 +++----
 .../PopupNavigationEvent.cs                   |  56 ++-
 .../PopupViewStackService.cs                  |  33 +-
 .../PopupViewStackServiceBase.cs              | 405 +++++++++---------
 .../Sextant.Plugins.Popup.csproj              |  14 +-
 src/Sextant.Plugins.Popup/SextantPopupPage.cs | 144 ++-----
 .../SextantPopupPage{TViewModel}.cs           |  57 +++
 ...provalTests.Sextant.DotNet6_0.verified.txt |   7 +-
 ...provalTests.Sextant.DotNet8_0.verified.txt |   7 +-
 .../DependencyResolverMixinTests.cs           |   5 +-
 .../Navigation/NavigationParameterTests.cs    |   2 +-
 .../ParameterViewStackServiceTests.cs         |  36 +-
 .../Navigation/ViewStackServiceTests.cs       |  24 +-
 src/Sextant.Tests/Sextant.Tests.csproj        |   4 +-
 src/Sextant.XamForms.Tests.zip                |   3 +
 ...lTests.SextantXamForms.net5.0.approved.txt |  51 ---
 ...lTests.SextantXamForms.net6.0.approved.txt |  53 ---
 ...SextantXamForms.netcoreapp3.1.approved.txt |  51 ---
 .../API/ApiApprovalTests.cs                   |  87 ----
 .../NavigationPageSystemPopBehaviorTests.cs   | 123 ------
 .../DependencyResolverMixinTests.cs           | 214 ---------
 .../Sextant.XamForms.Tests.csproj             |  24 --
 .../SextantExtensionTests.cs                  |  71 ---
 .../Behaviors/BehaviorBase.cs                 |  67 ---
 .../NavigationPageSystemPopBehavior.cs        |  66 ---
 .../Mixins/DependencyResolverMixins.cs        | 107 -----
 .../Mixins/SextantExtensions.cs               |  33 --
 src/Sextant.XamForms/NavigationSource.cs      |  22 -
 src/Sextant.XamForms/NavigationView.cs        | 246 -----------
 src/Sextant.XamForms/Sextant.XamForms.csproj  |  25 --
 .../Sextant.XamForms.csproj.DotSettings       |   3 -
 src/Sextant.sln                               |  15 +-
 src/Sextant/Abstractions/INavigable.cs        |   4 +-
 .../Abstractions/INavigationParameter.cs      |   1 +
 src/Sextant/Abstractions/IPageViewModel.cs    |  16 -
 src/Sextant/Abstractions/IViewModel.cs        |   2 +-
 src/Sextant/DependencyResolverMixins.cs       |  37 +-
 .../ParameterViewStackServiceBase.cs          |  21 +-
 .../Navigation/ViewStackServiceBase.cs        |   6 +-
 .../uikit-common/NavigationViewController.cs  |  30 +-
 .../uikit-common/SextantExtensions.cs         |   6 +-
 src/Sextant/Sextant.csproj                    |  48 +--
 version.json                                  |   2 +-
 231 files changed, 1195 insertions(+), 5044 deletions(-)
 create mode 100644 Archive/SextantSample.Android.zip
 create mode 100644 Archive/SextantSample.UWP.zip
 create mode 100644 Archive/SextantSample.WPF.zip
 create mode 100644 Archive/SextantSample.iOS.zip
 create mode 100644 Archive/SextantSample.zip
 create mode 100644 Samples/SextantSample.Maui/App.xaml
 create mode 100644 Samples/SextantSample.Maui/App.xaml.cs
 create mode 100644 Samples/SextantSample.Maui/AppShell.xaml
 create mode 100644 Samples/SextantSample.Maui/AppShell.xaml.cs
 rename {src/Sample => Samples}/SextantSample.Maui/GlobalUsings.cs (100%)
 create mode 100644 Samples/SextantSample.Maui/MainPage.xaml
 create mode 100644 Samples/SextantSample.Maui/MainPage.xaml.cs
 create mode 100644 Samples/SextantSample.Maui/MauiProgram.cs
 rename {src/Sample => Samples}/SextantSample.Maui/Platforms/Android/AndroidManifest.xml (76%)
 create mode 100644 Samples/SextantSample.Maui/Platforms/Android/MainActivity.cs
 create mode 100644 Samples/SextantSample.Maui/Platforms/Android/MainApplication.cs
 rename {src/Sample => Samples}/SextantSample.Maui/Platforms/Android/Resources/values/colors.xml (100%)
 create mode 100644 Samples/SextantSample.Maui/Platforms/MacCatalyst/AppDelegate.cs
 create mode 100644 Samples/SextantSample.Maui/Platforms/MacCatalyst/Entitlements.plist
 rename {src/Sample/SextantSample.Maui/Platforms/iOS => Samples/SextantSample.Maui/Platforms/MacCatalyst}/Info.plist (59%)
 create mode 100644 Samples/SextantSample.Maui/Platforms/MacCatalyst/Program.cs
 create mode 100644 Samples/SextantSample.Maui/Platforms/Tizen/Main.cs
 create mode 100644 Samples/SextantSample.Maui/Platforms/Tizen/tizen-manifest.xml
 rename {src/Sample => Samples}/SextantSample.Maui/Platforms/Windows/App.xaml (100%)
 create mode 100644 Samples/SextantSample.Maui/Platforms/Windows/App.xaml.cs
 rename {src/Sample => Samples}/SextantSample.Maui/Platforms/Windows/Package.appxmanifest (65%)
 rename {src/Sample => Samples}/SextantSample.Maui/Platforms/Windows/app.manifest (100%)
 create mode 100644 Samples/SextantSample.Maui/Platforms/iOS/AppDelegate.cs
 rename {src/Sample/SextantSample.Maui/Platforms/MacCatalyst => Samples/SextantSample.Maui/Platforms/iOS}/Info.plist (96%)
 create mode 100644 Samples/SextantSample.Maui/Platforms/iOS/Program.cs
 rename {src/Sample => Samples}/SextantSample.Maui/Properties/launchSettings.json (100%)
 rename {src/Sample => Samples}/SextantSample.Maui/Resources/AppIcon/appicon.svg (100%)
 rename {src/Sample => Samples}/SextantSample.Maui/Resources/AppIcon/appiconfg.svg (100%)
 create mode 100644 Samples/SextantSample.Maui/Resources/Fonts/OpenSans-Regular.ttf
 create mode 100644 Samples/SextantSample.Maui/Resources/Fonts/OpenSans-Semibold.ttf
 create mode 100644 Samples/SextantSample.Maui/Resources/Images/dotnet_bot.png
 rename {src/Sample => Samples}/SextantSample.Maui/Resources/Raw/AboutAssets.txt (86%)
 rename {src/Sample => Samples}/SextantSample.Maui/Resources/Splash/splash.svg (100%)
 rename {src/Sample => Samples}/SextantSample.Maui/Resources/Styles/Colors.xaml (80%)
 rename {src/Sample => Samples}/SextantSample.Maui/Resources/Styles/Styles.xaml (91%)
 create mode 100644 Samples/SextantSample.Maui/SextantSample.Maui.csproj
 rename {src/Sample => Samples}/SextantSample.Maui/Views/BlueNavigationView.cs (100%)
 rename {src/Sample => Samples}/SextantSample.Maui/Views/FirstModalView.xaml (100%)
 rename {src/Sample => Samples}/SextantSample.Maui/Views/FirstModalView.xaml.cs (100%)
 rename {src/Sample => Samples}/SextantSample.Maui/Views/GreenView.xaml (100%)
 rename {src/Sample => Samples}/SextantSample.Maui/Views/GreenView.xaml.cs (100%)
 rename {src/Sample => Samples}/SextantSample.Maui/Views/HomeView.xaml (100%)
 rename {src/Sample => Samples}/SextantSample.Maui/Views/HomeView.xaml.cs (100%)
 rename {src/Sample => Samples}/SextantSample.Maui/Views/RedView.xaml (100%)
 rename {src/Sample => Samples}/SextantSample.Maui/Views/RedView.xaml.cs (100%)
 rename {src/Sample => Samples}/SextantSample.Maui/Views/SecondModalView.xaml (100%)
 rename {src/Sample => Samples}/SextantSample.Maui/Views/SecondModalView.xaml.cs (100%)
 delete mode 100644 src/Sample/SextantSample.Android/Assets/AboutAssets.txt
 delete mode 100644 src/Sample/SextantSample.Android/MainActivity.cs
 delete mode 100644 src/Sample/SextantSample.Android/Properties/AndroidManifest.xml
 delete mode 100644 src/Sample/SextantSample.Android/Properties/AssemblyInfo.cs
 delete mode 100644 src/Sample/SextantSample.Android/Resources/AboutResources.txt
 delete mode 100644 src/Sample/SextantSample.Android/Resources/drawable/xamarin_logo.png
 delete mode 100644 src/Sample/SextantSample.Android/Resources/layout/Tabbar.axml
 delete mode 100644 src/Sample/SextantSample.Android/Resources/layout/Toolbar.axml
 delete mode 100644 src/Sample/SextantSample.Android/Resources/mipmap-anydpi-v26/icon.xml
 delete mode 100644 src/Sample/SextantSample.Android/Resources/mipmap-anydpi-v26/icon_round.xml
 delete mode 100644 src/Sample/SextantSample.Android/Resources/mipmap-hdpi/Icon.png
 delete mode 100644 src/Sample/SextantSample.Android/Resources/mipmap-hdpi/launcher_foreground.png
 delete mode 100644 src/Sample/SextantSample.Android/Resources/mipmap-mdpi/icon.png
 delete mode 100644 src/Sample/SextantSample.Android/Resources/mipmap-mdpi/launcher_foreground.png
 delete mode 100644 src/Sample/SextantSample.Android/Resources/mipmap-xhdpi/Icon.png
 delete mode 100644 src/Sample/SextantSample.Android/Resources/mipmap-xhdpi/launcher_foreground.png
 delete mode 100644 src/Sample/SextantSample.Android/Resources/mipmap-xxhdpi/Icon.png
 delete mode 100644 src/Sample/SextantSample.Android/Resources/mipmap-xxhdpi/launcher_foreground.png
 delete mode 100644 src/Sample/SextantSample.Android/Resources/mipmap-xxxhdpi/Icon.png
 delete mode 100644 src/Sample/SextantSample.Android/Resources/mipmap-xxxhdpi/launcher_foreground.png
 delete mode 100644 src/Sample/SextantSample.Android/Resources/values/colors.xml
 delete mode 100644 src/Sample/SextantSample.Android/Resources/values/styles.xml
 delete mode 100644 src/Sample/SextantSample.Android/Resources/xml/file_paths.xml
 delete mode 100644 src/Sample/SextantSample.Android/SextantSample.Android.csproj
 delete mode 100644 src/Sample/SextantSample.Maui/App.xaml
 delete mode 100644 src/Sample/SextantSample.Maui/App.xaml.cs
 delete mode 100644 src/Sample/SextantSample.Maui/MauiProgram.cs
 delete mode 100644 src/Sample/SextantSample.Maui/Platforms/Android/MainActivity.cs
 delete mode 100644 src/Sample/SextantSample.Maui/Platforms/Android/MainApplication.cs
 delete mode 100644 src/Sample/SextantSample.Maui/Platforms/MacCatalyst/AppDelegate.cs
 delete mode 100644 src/Sample/SextantSample.Maui/Platforms/MacCatalyst/Program.cs
 delete mode 100644 src/Sample/SextantSample.Maui/Platforms/Windows/App.xaml.cs
 delete mode 100644 src/Sample/SextantSample.Maui/Platforms/iOS/AppDelegate.cs
 delete mode 100644 src/Sample/SextantSample.Maui/Platforms/iOS/Program.cs
 delete mode 100644 src/Sample/SextantSample.Maui/Platforms/iOS/Resources/LaunchScreen.xib
 delete mode 100644 src/Sample/SextantSample.Maui/Resources/Fonts/OpenSans-Regular.ttf
 delete mode 100644 src/Sample/SextantSample.Maui/Resources/Fonts/OpenSans-Semibold.ttf
 delete mode 100644 src/Sample/SextantSample.Maui/Resources/Images/dotnet_bot.svg
 delete mode 100644 src/Sample/SextantSample.Maui/SextantSample.Maui.csproj
 delete mode 100644 src/Sample/SextantSample.UWP/App.xaml
 delete mode 100644 src/Sample/SextantSample.UWP/App.xaml.cs
 delete mode 100644 src/Sample/SextantSample.UWP/Assets/LockScreenLogo.scale-200.png
 delete mode 100644 src/Sample/SextantSample.UWP/Assets/SplashScreen.scale-200.png
 delete mode 100644 src/Sample/SextantSample.UWP/Assets/Square150x150Logo.scale-200.png
 delete mode 100644 src/Sample/SextantSample.UWP/Assets/Square44x44Logo.scale-200.png
 delete mode 100644 src/Sample/SextantSample.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
 delete mode 100644 src/Sample/SextantSample.UWP/Assets/StoreLogo.png
 delete mode 100644 src/Sample/SextantSample.UWP/Assets/Wide310x150Logo.scale-200.png
 delete mode 100644 src/Sample/SextantSample.UWP/Package.appxmanifest
 delete mode 100644 src/Sample/SextantSample.UWP/Properties/AssemblyInfo.cs
 delete mode 100644 src/Sample/SextantSample.UWP/Properties/Default.rd.xml
 delete mode 100644 src/Sample/SextantSample.UWP/SextantDefaultExceptionHandler.cs
 delete mode 100644 src/Sample/SextantSample.UWP/SextantSample.UWP.csproj
 delete mode 100644 src/Sample/SextantSample.UWP/Views/BlueNavigationView.cs
 delete mode 100644 src/Sample/SextantSample.UWP/Views/FirstModalView.xaml
 delete mode 100644 src/Sample/SextantSample.UWP/Views/FirstModalView.xaml.cs
 delete mode 100644 src/Sample/SextantSample.UWP/Views/GreenView.xaml
 delete mode 100644 src/Sample/SextantSample.UWP/Views/GreenView.xaml.cs
 delete mode 100644 src/Sample/SextantSample.UWP/Views/HomeView.xaml
 delete mode 100644 src/Sample/SextantSample.UWP/Views/HomeView.xaml.cs
 delete mode 100644 src/Sample/SextantSample.UWP/Views/RedView.xaml
 delete mode 100644 src/Sample/SextantSample.UWP/Views/RedView.xaml.cs
 delete mode 100644 src/Sample/SextantSample.UWP/Views/SecondModalView.xaml
 delete mode 100644 src/Sample/SextantSample.UWP/Views/SecondModalView.xaml.cs
 delete mode 100644 src/Sample/SextantSample.WPF/App.xaml
 delete mode 100644 src/Sample/SextantSample.WPF/App.xaml.cs
 delete mode 100644 src/Sample/SextantSample.WPF/AssemblyInfo.cs
 delete mode 100644 src/Sample/SextantSample.WPF/MainWindow.xaml
 delete mode 100644 src/Sample/SextantSample.WPF/MainWindow.xaml.cs
 delete mode 100644 src/Sample/SextantSample.WPF/SextantSample.WPF.csproj
 delete mode 100644 src/Sample/SextantSample.iOS/AppDelegate.cs
 delete mode 100644 src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
 delete mode 100644 src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon1024.png
 delete mode 100644 src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon120.png
 delete mode 100644 src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon152.png
 delete mode 100644 src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon167.png
 delete mode 100644 src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon180.png
 delete mode 100644 src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon20.png
 delete mode 100644 src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon29.png
 delete mode 100644 src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon40.png
 delete mode 100644 src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon58.png
 delete mode 100644 src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon60.png
 delete mode 100644 src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon76.png
 delete mode 100644 src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon80.png
 delete mode 100644 src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon87.png
 delete mode 100644 src/Sample/SextantSample.iOS/Entitlements.plist
 delete mode 100644 src/Sample/SextantSample.iOS/Info.plist
 delete mode 100644 src/Sample/SextantSample.iOS/Main.cs
 delete mode 100644 src/Sample/SextantSample.iOS/Properties/AssemblyInfo.cs
 delete mode 100644 src/Sample/SextantSample.iOS/Resources/Default-568h@2x.png
 delete mode 100644 src/Sample/SextantSample.iOS/Resources/Default-Portrait.png
 delete mode 100644 src/Sample/SextantSample.iOS/Resources/Default-Portrait@2x.png
 delete mode 100644 src/Sample/SextantSample.iOS/Resources/Default.png
 delete mode 100644 src/Sample/SextantSample.iOS/Resources/Default@2x.png
 delete mode 100644 src/Sample/SextantSample.iOS/Resources/LaunchScreen.storyboard
 delete mode 100644 src/Sample/SextantSample.iOS/SextantSample.iOS.csproj
 delete mode 100644 src/Sample/SextantSample/App.xaml
 delete mode 100644 src/Sample/SextantSample/App.xaml.cs
 delete mode 100644 src/Sample/SextantSample/SextantSample.csproj
 delete mode 100644 src/Sample/SextantSample/Views/BlueNavigationView.cs
 delete mode 100644 src/Sample/SextantSample/Views/FirstModalView.xaml
 delete mode 100644 src/Sample/SextantSample/Views/FirstModalView.xaml.cs
 delete mode 100644 src/Sample/SextantSample/Views/GreenView.xaml
 delete mode 100644 src/Sample/SextantSample/Views/GreenView.xaml.cs
 delete mode 100644 src/Sample/SextantSample/Views/HomeView.xaml
 delete mode 100644 src/Sample/SextantSample/Views/HomeView.xaml.cs
 delete mode 100644 src/Sample/SextantSample/Views/RedView.xaml
 delete mode 100644 src/Sample/SextantSample/Views/RedView.xaml.cs
 delete mode 100644 src/Sample/SextantSample/Views/SecondModalView.xaml
 delete mode 100644 src/Sample/SextantSample/Views/SecondModalView.xaml.cs
 create mode 100644 src/Sextant.Plugins.Popup/SextantPopupPage{TViewModel}.cs
 create mode 100644 src/Sextant.XamForms.Tests.zip
 delete mode 100644 src/Sextant.XamForms.Tests/API/ApiApprovalTests.SextantXamForms.net5.0.approved.txt
 delete mode 100644 src/Sextant.XamForms.Tests/API/ApiApprovalTests.SextantXamForms.net6.0.approved.txt
 delete mode 100644 src/Sextant.XamForms.Tests/API/ApiApprovalTests.SextantXamForms.netcoreapp3.1.approved.txt
 delete mode 100644 src/Sextant.XamForms.Tests/API/ApiApprovalTests.cs
 delete mode 100644 src/Sextant.XamForms.Tests/Behaviors/NavigationPageSystemPopBehaviorTests.cs
 delete mode 100644 src/Sextant.XamForms.Tests/DependencyResolverMixinTests.cs
 delete mode 100644 src/Sextant.XamForms.Tests/Sextant.XamForms.Tests.csproj
 delete mode 100644 src/Sextant.XamForms.Tests/SextantExtensionTests.cs
 delete mode 100644 src/Sextant.XamForms/Behaviors/BehaviorBase.cs
 delete mode 100644 src/Sextant.XamForms/Behaviors/NavigationPageSystemPopBehavior.cs
 delete mode 100644 src/Sextant.XamForms/Mixins/DependencyResolverMixins.cs
 delete mode 100644 src/Sextant.XamForms/Mixins/SextantExtensions.cs
 delete mode 100644 src/Sextant.XamForms/NavigationSource.cs
 delete mode 100644 src/Sextant.XamForms/NavigationView.cs
 delete mode 100644 src/Sextant.XamForms/Sextant.XamForms.csproj
 delete mode 100644 src/Sextant.XamForms/Sextant.XamForms.csproj.DotSettings
 delete mode 100644 src/Sextant/Abstractions/IPageViewModel.cs

diff --git a/.editorconfig b/.editorconfig
index 20db31bc..be457ccc 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -10,6 +10,39 @@ root = true
 insert_final_newline = true
 indent_style = space
 indent_size = 4
+dotnet_diagnostic.CA1027.severity=error
+dotnet_diagnostic.CA1062.severity=error
+dotnet_diagnostic.CA1064.severity=error
+dotnet_diagnostic.CA1066.severity=error
+dotnet_diagnostic.CA1067.severity=error
+dotnet_diagnostic.CA1068.severity=error
+dotnet_diagnostic.CA1069.severity=warning
+dotnet_diagnostic.CA2013.severity=error
+dotnet_diagnostic.CA1802.severity=error
+dotnet_diagnostic.CA1813.severity=error
+dotnet_diagnostic.CA1814.severity=error
+dotnet_diagnostic.CA1815.severity=error
+dotnet_diagnostic.CA1822.severity=error
+dotnet_diagnostic.CA1827.severity=error
+dotnet_diagnostic.CA1828.severity=error
+dotnet_diagnostic.CA1826.severity=error
+dotnet_diagnostic.CA1829.severity=error
+dotnet_diagnostic.CA1830.severity=error
+dotnet_diagnostic.CA1831.severity=error
+dotnet_diagnostic.CA1832.severity=error
+dotnet_diagnostic.CA1833.severity=error
+dotnet_diagnostic.CA1834.severity=error
+dotnet_diagnostic.CA1835.severity=error
+dotnet_diagnostic.CA1836.severity=error
+dotnet_diagnostic.CA1837.severity=error
+dotnet_diagnostic.CA1838.severity=error
+dotnet_diagnostic.CA2015.severity=error
+dotnet_diagnostic.CA2012.severity=error
+dotnet_diagnostic.CA2011.severity=error
+dotnet_diagnostic.CA2009.severity=error
+dotnet_diagnostic.CA2008.severity=error
+dotnet_diagnostic.CA2007.severity=warning
+dotnet_diagnostic.CA2000.severity=suggestion
 
 [project.json]
 indent_size = 2
@@ -43,14 +76,11 @@ dotnet_style_qualification_for_method = false:suggestion
 dotnet_style_qualification_for_event = false:suggestion
 
 # only use var when it's obvious what the variable type is
-csharp_style_var_for_built_in_types = false:none
+csharp_style_var_for_built_in_types = true:suggestion
 csharp_style_var_when_type_is_apparent = true:suggestion
 csharp_style_var_elsewhere = true:suggestion
 
-# Types: use keywords instead of BCL types, and permit var only when the type is clear
-csharp_style_var_for_built_in_types = false:suggestion
-csharp_style_var_when_type_is_apparent = false:none
-csharp_style_var_elsewhere = false:suggestion
+# prefer C# premade types.
 dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
 dotnet_style_predefined_type_for_member_access = true:suggestion
 
@@ -370,7 +400,7 @@ dotnet_diagnostic.SA1501.severity = error
 dotnet_diagnostic.SA1502.severity = error
 dotnet_diagnostic.SA1503.severity = error
 dotnet_diagnostic.SA1504.severity = error
-dotnet_diagnostic.SA1505.severity = error
+dotnet_diagnostic.SA1505.severity = none
 dotnet_diagnostic.SA1506.severity = error
 dotnet_diagnostic.SA1507.severity = error
 dotnet_diagnostic.SA1508.severity = error
@@ -379,7 +409,7 @@ dotnet_diagnostic.SA1510.severity = error
 dotnet_diagnostic.SA1511.severity = error
 dotnet_diagnostic.SA1512.severity = error
 dotnet_diagnostic.SA1513.severity = error
-dotnet_diagnostic.SA1514.severity = error
+dotnet_diagnostic.SA1514.severity = none
 dotnet_diagnostic.SA1515.severity = error
 dotnet_diagnostic.SA1516.severity = error
 dotnet_diagnostic.SA1517.severity = error
@@ -429,6 +459,48 @@ dotnet_diagnostic.SA1651.severity = error
 dotnet_diagnostic.SX1101.severity = error
 dotnet_diagnostic.SX1309.severity = error
 dotnet_diagnostic.SX1623.severity = none
+dotnet_diagnostic.RCS1102.severity=error
+dotnet_diagnostic.RCS1166.severity=error
+dotnet_diagnostic.RCS1078i.severity=error
+dotnet_diagnostic.RCS1248.severity=error
+dotnet_diagnostic.RCS1080.severity=error
+dotnet_diagnostic.RCS1077.severity=error
+dotnet_diagnostic.CA1825.severity=error
+dotnet_diagnostic.CA1812.severity=error
+dotnet_diagnostic.CA1805.severity=error
+dotnet_diagnostic.RCS1197.severity=error
+dotnet_diagnostic.RCS1198.severity=none
+dotnet_diagnostic.RCS1231.severity=suggestion
+dotnet_diagnostic.RCS1235.severity=error
+dotnet_diagnostic.RCS1242.severity=error
+dotnet_diagnostic.RCS1256.severity=none
+dotnet_diagnostic.CA2016.severity=warning
+dotnet_diagnostic.CA2014.severity=error
+dotnet_diagnostic.RCS1010.severity=error
+dotnet_diagnostic.RCS1006.severity=error
+dotnet_diagnostic.RCS1005.severity=error
+dotnet_diagnostic.RCS1020.severity=error
+dotnet_diagnostic.RCS1049.severity=warning
+dotnet_diagnostic.RCS1058.severity=warning
+dotnet_diagnostic.RCS1068.severity=warning
+dotnet_diagnostic.RCS1073.severity=warning
+dotnet_diagnostic.RCS1084.severity=error
+dotnet_diagnostic.RCS1085.severity=error
+dotnet_diagnostic.RCS1105.severity=error
+dotnet_diagnostic.RCS1112.severity=error
+dotnet_diagnostic.RCS1128.severity=error
+dotnet_diagnostic.RCS1143.severity=error
+dotnet_diagnostic.RCS1158.severity=none
+dotnet_diagnostic.RCS1163.severity=none
+dotnet_diagnostic.RCS1171.severity=error
+dotnet_diagnostic.RCS1173.severity=error
+dotnet_diagnostic.RCS1176.severity=error
+dotnet_diagnostic.RCS1177.severity=error
+dotnet_diagnostic.RCS1179.severity=error
+dotnet_diagnostic.RCS1180.severity=warning
+dotnet_diagnostic.RCS1190.severity=error
+dotnet_diagnostic.RCS1195.severity=error
+dotnet_diagnostic.RCS1214.severity=error
 
 # C++ Files
 [*.{cpp,h,in}]
@@ -456,3 +528,5 @@ indent_size = 2
 end_of_line = lf
 [*.{cmd, bat}]
 end_of_line = crlf
+
+vsspell_dictionary_languages = en-US
\ No newline at end of file
diff --git a/.github/workflows/build-samples.yml b/.github/workflows/build-samples.yml
index 5f889761..fe522353 100644
--- a/.github/workflows/build-samples.yml
+++ b/.github/workflows/build-samples.yml
@@ -15,5 +15,6 @@ jobs:
     uses: reactiveui/actions-common/.github/workflows/workflow-common-setup-and-build.yml@main
     with:
       productNamespacePrefix: "Sextant"
+      dotNetBuild: true
       srcFolder: "src/Sample"
       solutionFile: "SextantSample.sln"
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index 5f0c7180..a25e217d 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -15,4 +15,5 @@ jobs:
     uses: reactiveui/actions-common/.github/workflows/workflow-common-setup-and-build.yml@main
     with:
       productNamespacePrefix: "Sextant"
+      dotNetBuild: true
       solutionFile: "Sextant.sln"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 93ad408d..3d7878de 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,6 +15,7 @@ jobs:
     uses: reactiveui/actions-common/.github/workflows/workflow-common-release.yml@main
     with:
       productNamespacePrefix: "Sextant"
+      dotNetBuild: true
       solutionFile: "Sextant.sln"
     secrets:
       SIGN_CLIENT_USER_ID: ${{ secrets.SIGN_CLIENT_USER_ID }}
diff --git a/Archive/SextantSample.Android.zip b/Archive/SextantSample.Android.zip
new file mode 100644
index 00000000..a90e0701
--- /dev/null
+++ b/Archive/SextantSample.Android.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8bfbbbd1808a7c4beb72e66910afd1d0877021a4a2358b1983bed4c6ac0a01b2
+size 380876
diff --git a/Archive/SextantSample.UWP.zip b/Archive/SextantSample.UWP.zip
new file mode 100644
index 00000000..771c180e
--- /dev/null
+++ b/Archive/SextantSample.UWP.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bc65d5ae757fb279025f816fcc3879d4add41d4d1be9c84141c1d951bc603948
+size 28396
diff --git a/Archive/SextantSample.WPF.zip b/Archive/SextantSample.WPF.zip
new file mode 100644
index 00000000..109f6d82
--- /dev/null
+++ b/Archive/SextantSample.WPF.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d73db28596c60bb4b5f2886c87f099722c68867f415a2358e28cd52c7e418888
+size 2604
diff --git a/Archive/SextantSample.iOS.zip b/Archive/SextantSample.iOS.zip
new file mode 100644
index 00000000..9d48ffef
--- /dev/null
+++ b/Archive/SextantSample.iOS.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:726c12eac6708a834f38afa060e325ff9abaa09f1973d49cf639d232cd720cc8
+size 149107
diff --git a/Archive/SextantSample.zip b/Archive/SextantSample.zip
new file mode 100644
index 00000000..da6f49d0
--- /dev/null
+++ b/Archive/SextantSample.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f7450bf017b6e4bbca37982d9efe2b6cc11a1cdcedd31d3eb023e83adb3d6a00
+size 8320
diff --git a/Samples/SextantSample.Maui/App.xaml b/Samples/SextantSample.Maui/App.xaml
new file mode 100644
index 00000000..e6062012
--- /dev/null
+++ b/Samples/SextantSample.Maui/App.xaml
@@ -0,0 +1,14 @@
+<?xml version = "1.0" encoding = "UTF-8" ?>
+<Application xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:local="clr-namespace:SextantSample.Maui"
+             x:Class="SextantSample.Maui.App">
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="Resources/Styles/Colors.xaml" />
+                <ResourceDictionary Source="Resources/Styles/Styles.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Application.Resources>
+</Application>
diff --git a/Samples/SextantSample.Maui/App.xaml.cs b/Samples/SextantSample.Maui/App.xaml.cs
new file mode 100644
index 00000000..d213f853
--- /dev/null
+++ b/Samples/SextantSample.Maui/App.xaml.cs
@@ -0,0 +1,19 @@
+namespace SextantSample.Maui
+{
+    public partial class App : Application
+    {
+        public App()
+        {
+            InitializeComponent();
+
+            ////MainPage = new AppShell();
+            Locator
+            .Current
+            .GetService<IViewStackService>()
+            .PushPage(new HomeViewModel(), null, true, false)
+            .Subscribe();
+
+            MainPage = Locator.Current.GetNavigationView();
+        }
+    }
+}
diff --git a/Samples/SextantSample.Maui/AppShell.xaml b/Samples/SextantSample.Maui/AppShell.xaml
new file mode 100644
index 00000000..ea99f4e0
--- /dev/null
+++ b/Samples/SextantSample.Maui/AppShell.xaml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<Shell
+    x:Class="SextantSample.Maui.AppShell"
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:local="clr-namespace:SextantSample.Maui"
+    Shell.FlyoutBehavior="Disabled"
+    Title="SextantSample.Maui">
+
+    <ShellContent
+        Title="Home"
+        ContentTemplate="{DataTemplate local:MainPage}"
+        Route="MainPage" />
+
+</Shell>
diff --git a/Samples/SextantSample.Maui/AppShell.xaml.cs b/Samples/SextantSample.Maui/AppShell.xaml.cs
new file mode 100644
index 00000000..945c9fd5
--- /dev/null
+++ b/Samples/SextantSample.Maui/AppShell.xaml.cs
@@ -0,0 +1,10 @@
+namespace SextantSample.Maui
+{
+    public partial class AppShell : Shell
+    {
+        public AppShell()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/src/Sample/SextantSample.Maui/GlobalUsings.cs b/Samples/SextantSample.Maui/GlobalUsings.cs
similarity index 100%
rename from src/Sample/SextantSample.Maui/GlobalUsings.cs
rename to Samples/SextantSample.Maui/GlobalUsings.cs
diff --git a/Samples/SextantSample.Maui/MainPage.xaml b/Samples/SextantSample.Maui/MainPage.xaml
new file mode 100644
index 00000000..5223e055
--- /dev/null
+++ b/Samples/SextantSample.Maui/MainPage.xaml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="SextantSample.Maui.MainPage">
+
+    <ScrollView>
+        <VerticalStackLayout
+            Padding="30,0"
+            Spacing="25">
+            <Image
+                Source="dotnet_bot.png"
+                HeightRequest="185"
+                Aspect="AspectFit"
+                SemanticProperties.Description="dot net bot in a race car number eight" />
+
+            <Label
+                Text="Hello, World!"
+                Style="{StaticResource Headline}"
+                SemanticProperties.HeadingLevel="Level1" />
+
+            <Label
+                Text="Welcome to &#10;.NET Multi-platform App UI"
+                Style="{StaticResource SubHeadline}"
+                SemanticProperties.HeadingLevel="Level2"
+                SemanticProperties.Description="Welcome to dot net Multi platform App U I" />
+
+            <Button
+                x:Name="CounterBtn"
+                Text="Click me" 
+                SemanticProperties.Hint="Counts the number of times you click"
+                Clicked="OnCounterClicked"
+                HorizontalOptions="Fill" />
+        </VerticalStackLayout>
+    </ScrollView>
+
+</ContentPage>
diff --git a/Samples/SextantSample.Maui/MainPage.xaml.cs b/Samples/SextantSample.Maui/MainPage.xaml.cs
new file mode 100644
index 00000000..35ee7ed8
--- /dev/null
+++ b/Samples/SextantSample.Maui/MainPage.xaml.cs
@@ -0,0 +1,25 @@
+namespace SextantSample.Maui
+{
+    public partial class MainPage : ContentPage
+    {
+        int count;
+
+        public MainPage()
+        {
+            InitializeComponent();
+        }
+
+        private void OnCounterClicked(object sender, EventArgs e)
+        {
+            count++;
+
+            if (count == 1)
+                CounterBtn.Text = $"Clicked {count} time";
+            else
+                CounterBtn.Text = $"Clicked {count} times";
+
+            SemanticScreenReader.Announce(CounterBtn.Text);
+        }
+    }
+
+}
diff --git a/Samples/SextantSample.Maui/MauiProgram.cs b/Samples/SextantSample.Maui/MauiProgram.cs
new file mode 100644
index 00000000..c219c10e
--- /dev/null
+++ b/Samples/SextantSample.Maui/MauiProgram.cs
@@ -0,0 +1,38 @@
+using Microsoft.Extensions.Logging;
+
+namespace SextantSample.Maui
+{
+    public static class MauiProgram
+    {
+        public static MauiApp CreateMauiApp()
+        {
+            var builder = MauiApp.CreateBuilder();
+            builder
+                .UseMauiApp<App>()
+                .ConfigureFonts(fonts =>
+                {
+                    fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
+                    fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
+                });
+            RxApp.DefaultExceptionHandler = new SextantDefaultExceptionHandler();
+            var resolver = Locator.CurrentMutable;
+            resolver.InitializeSplat();
+            resolver.InitializeReactiveUI();
+            ////Instance.InitializeMaui();
+            Locator
+                .CurrentMutable
+                .RegisterViewForNavigation<HomeView, HomeViewModel>()
+                .RegisterViewForNavigation<FirstModalView, FirstModalViewModel>(() => new(), () => new(Locator.Current.GetService<IViewStackService>()))
+                .RegisterViewForNavigation<SecondModalView, SecondModalViewModel>(() => new(), () => new(Locator.Current.GetService<IViewStackService>()))
+                .RegisterViewForNavigation<RedView, RedViewModel>(() => new(), () => new(Locator.Current.GetService<IViewStackService>()))
+                .RegisterViewForNavigation<GreenView, GreenViewModel>(() => new(), () => new(Locator.Current.GetService<IViewStackService>()))
+                .RegisterNavigationView(() => new BlueNavigationView());
+
+#if DEBUG
+            builder.Logging.AddDebug();
+#endif
+
+            return builder.Build();
+        }
+    }
+}
diff --git a/src/Sample/SextantSample.Maui/Platforms/Android/AndroidManifest.xml b/Samples/SextantSample.Maui/Platforms/Android/AndroidManifest.xml
similarity index 76%
rename from src/Sample/SextantSample.Maui/Platforms/Android/AndroidManifest.xml
rename to Samples/SextantSample.Maui/Platforms/Android/AndroidManifest.xml
index 0f8b33b6..a66cfe96 100644
--- a/src/Sample/SextantSample.Maui/Platforms/Android/AndroidManifest.xml
+++ b/Samples/SextantSample.Maui/Platforms/Android/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="31" />
 	<application android:allowBackup="true" android:supportsRtl="true"></application>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-</manifest>
\ No newline at end of file
+	<uses-permission android:name="android.permission.INTERNET" />
+</manifest>
diff --git a/Samples/SextantSample.Maui/Platforms/Android/MainActivity.cs b/Samples/SextantSample.Maui/Platforms/Android/MainActivity.cs
new file mode 100644
index 00000000..0aecf3b9
--- /dev/null
+++ b/Samples/SextantSample.Maui/Platforms/Android/MainActivity.cs
@@ -0,0 +1,11 @@
+using Android.App;
+using Android.Content.PM;
+using Android.OS;
+
+namespace SextantSample.Maui
+{
+    [Activity(Theme = "@style/Maui.SplashTheme", MainLauncher = true, LaunchMode = LaunchMode.SingleTop, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize | ConfigChanges.Density)]
+    public class MainActivity : MauiAppCompatActivity
+    {
+    }
+}
diff --git a/Samples/SextantSample.Maui/Platforms/Android/MainApplication.cs b/Samples/SextantSample.Maui/Platforms/Android/MainApplication.cs
new file mode 100644
index 00000000..2945aa2c
--- /dev/null
+++ b/Samples/SextantSample.Maui/Platforms/Android/MainApplication.cs
@@ -0,0 +1,16 @@
+using Android.App;
+using Android.Runtime;
+
+namespace SextantSample.Maui
+{
+    [Application]
+    public class MainApplication : MauiApplication
+    {
+        public MainApplication(IntPtr handle, JniHandleOwnership ownership)
+            : base(handle, ownership)
+        {
+        }
+
+        protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
+    }
+}
diff --git a/src/Sample/SextantSample.Maui/Platforms/Android/Resources/values/colors.xml b/Samples/SextantSample.Maui/Platforms/Android/Resources/values/colors.xml
similarity index 100%
rename from src/Sample/SextantSample.Maui/Platforms/Android/Resources/values/colors.xml
rename to Samples/SextantSample.Maui/Platforms/Android/Resources/values/colors.xml
diff --git a/Samples/SextantSample.Maui/Platforms/MacCatalyst/AppDelegate.cs b/Samples/SextantSample.Maui/Platforms/MacCatalyst/AppDelegate.cs
new file mode 100644
index 00000000..8e6aaae5
--- /dev/null
+++ b/Samples/SextantSample.Maui/Platforms/MacCatalyst/AppDelegate.cs
@@ -0,0 +1,10 @@
+using Foundation;
+
+namespace SextantSample.Maui
+{
+    [Register("AppDelegate")]
+    public class AppDelegate : MauiUIApplicationDelegate
+    {
+        protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
+    }
+}
diff --git a/Samples/SextantSample.Maui/Platforms/MacCatalyst/Entitlements.plist b/Samples/SextantSample.Maui/Platforms/MacCatalyst/Entitlements.plist
new file mode 100644
index 00000000..de4adc94
--- /dev/null
+++ b/Samples/SextantSample.Maui/Platforms/MacCatalyst/Entitlements.plist
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+    <!-- See https://aka.ms/maui-publish-app-store#add-entitlements for more information about adding entitlements.-->
+    <dict>
+        <!-- App Sandbox must be enabled to distribute a MacCatalyst app through the Mac App Store. -->
+        <key>com.apple.security.app-sandbox</key>
+        <true/>
+        <!-- When App Sandbox is enabled, this value is required to open outgoing network connections. -->
+        <key>com.apple.security.network.client</key>
+        <true/>
+    </dict>
+</plist>
+
diff --git a/src/Sample/SextantSample.Maui/Platforms/iOS/Info.plist b/Samples/SextantSample.Maui/Platforms/MacCatalyst/Info.plist
similarity index 59%
rename from src/Sample/SextantSample.Maui/Platforms/iOS/Info.plist
rename to Samples/SextantSample.Maui/Platforms/MacCatalyst/Info.plist
index ed2ffb61..72689771 100644
--- a/src/Sample/SextantSample.Maui/Platforms/iOS/Info.plist
+++ b/Samples/SextantSample.Maui/Platforms/MacCatalyst/Info.plist
@@ -2,13 +2,17 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>MinimumOSVersion</key>
-	<string>10.3.4</string>
+    <!-- The Mac App Store requires you specify if the app uses encryption. -->
+    <!-- Please consult https://developer.apple.com/documentation/bundleresources/information_property_list/itsappusesnonexemptencryption -->
+    <!-- <key>ITSAppUsesNonExemptEncryption</key> -->
+    <!-- Please indicate <true/> or <false/> here. -->
+
+    <!-- Specify the category for your app here. -->
+    <!-- Please consult https://developer.apple.com/documentation/bundleresources/information_property_list/lsapplicationcategorytype -->
+    <!-- <key>LSApplicationCategoryType</key> -->
+    <!-- <string>public.app-category.YOUR-CATEGORY-HERE</string> -->
 	<key>UIDeviceFamily</key>
 	<array>
-		<integer>1</integer>
 		<integer>2</integer>
 	</array>
 	<key>UIRequiredDeviceCapabilities</key>
diff --git a/Samples/SextantSample.Maui/Platforms/MacCatalyst/Program.cs b/Samples/SextantSample.Maui/Platforms/MacCatalyst/Program.cs
new file mode 100644
index 00000000..292017fd
--- /dev/null
+++ b/Samples/SextantSample.Maui/Platforms/MacCatalyst/Program.cs
@@ -0,0 +1,10 @@
+using UIKit;
+
+namespace SextantSample.Maui
+{
+    public static class Program
+    {
+        // This is the main entry point of the application.
+        static void Main(string[] args) => UIApplication.Main(args, null, typeof(AppDelegate));
+    }
+}
diff --git a/Samples/SextantSample.Maui/Platforms/Tizen/Main.cs b/Samples/SextantSample.Maui/Platforms/Tizen/Main.cs
new file mode 100644
index 00000000..c327d600
--- /dev/null
+++ b/Samples/SextantSample.Maui/Platforms/Tizen/Main.cs
@@ -0,0 +1,17 @@
+using System;
+using Microsoft.Maui;
+using Microsoft.Maui.Hosting;
+
+namespace SextantSample.Maui
+{
+    internal class Program : MauiApplication
+    {
+        protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
+
+        static void Main(string[] args)
+        {
+            var app = new Program();
+            app.Run(args);
+        }
+    }
+}
diff --git a/Samples/SextantSample.Maui/Platforms/Tizen/tizen-manifest.xml b/Samples/SextantSample.Maui/Platforms/Tizen/tizen-manifest.xml
new file mode 100644
index 00000000..c376e6ee
--- /dev/null
+++ b/Samples/SextantSample.Maui/Platforms/Tizen/tizen-manifest.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="maui-application-id-placeholder" version="0.0.0" api-version="8" xmlns="http://tizen.org/ns/packages">
+  <profile name="common" />
+  <ui-application appid="maui-application-id-placeholder" exec="SextantSample.Maui.dll" multiple="false" nodisplay="false" taskmanage="true" type="dotnet" launch_mode="single">
+    <label>maui-application-title-placeholder</label>
+    <icon>maui-appicon-placeholder</icon>
+    <metadata key="http://tizen.org/metadata/prefer_dotnet_aot" value="true" />
+  </ui-application>
+  <shortcut-list />
+  <privileges>
+    <privilege>http://tizen.org/privilege/internet</privilege>
+  </privileges> 
+  <dependencies />
+  <provides-appdefined-privileges />
+</manifest>
\ No newline at end of file
diff --git a/src/Sample/SextantSample.Maui/Platforms/Windows/App.xaml b/Samples/SextantSample.Maui/Platforms/Windows/App.xaml
similarity index 100%
rename from src/Sample/SextantSample.Maui/Platforms/Windows/App.xaml
rename to Samples/SextantSample.Maui/Platforms/Windows/App.xaml
diff --git a/Samples/SextantSample.Maui/Platforms/Windows/App.xaml.cs b/Samples/SextantSample.Maui/Platforms/Windows/App.xaml.cs
new file mode 100644
index 00000000..a127cad3
--- /dev/null
+++ b/Samples/SextantSample.Maui/Platforms/Windows/App.xaml.cs
@@ -0,0 +1,25 @@
+using Microsoft.UI.Xaml;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
+
+namespace SextantSample.Maui.WinUI
+{
+    /// <summary>
+    /// Provides application-specific behavior to supplement the default Application class.
+    /// </summary>
+    public partial class App : MauiWinUIApplication
+    {
+        /// <summary>
+        /// Initializes the singleton application object.  This is the first line of authored code
+        /// executed, and as such is the logical equivalent of main() or WinMain().
+        /// </summary>
+        public App()
+        {
+            this.InitializeComponent();
+        }
+
+        protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
+    }
+
+}
diff --git a/src/Sample/SextantSample.Maui/Platforms/Windows/Package.appxmanifest b/Samples/SextantSample.Maui/Platforms/Windows/Package.appxmanifest
similarity index 65%
rename from src/Sample/SextantSample.Maui/Platforms/Windows/Package.appxmanifest
rename to Samples/SextantSample.Maui/Platforms/Windows/Package.appxmanifest
index a04e3629..b41e1075 100644
--- a/src/Sample/SextantSample.Maui/Platforms/Windows/Package.appxmanifest
+++ b/Samples/SextantSample.Maui/Platforms/Windows/Package.appxmanifest
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <Package
   xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
   xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
@@ -7,12 +6,9 @@
   xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
   IgnorableNamespaces="uap rescap">
 
-  <Identity
-    Name="maui-package-name-placeholder"
-    Publisher="CN=User Name"
-    Version="0.0.0.0" />
+  <Identity Name="maui-package-name-placeholder" Publisher="CN=User Name" Version="0.0.0.0" />
 
-  <mp:PhoneIdentity PhoneProductId="566ab4d8-35c0-4bac-9cd5-331f40da70eb" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
+  <mp:PhoneIdentity PhoneProductId="C55C9A3A-F8D7-473C-9578-AB973286E591" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 
   <Properties>
     <DisplayName>$placeholder$</DisplayName>
@@ -26,24 +22,18 @@
   </Dependencies>
 
   <Resources>
-    <Resource Language="x-generate"/>
+    <Resource Language="x-generate" />
   </Resources>
 
   <Applications>
-    <Application Id="App"
-      Executable="$targetnametoken$.exe"
-      EntryPoint="$targetentrypoint$">
+    <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="$targetentrypoint$">
       <uap:VisualElements
         DisplayName="$placeholder$"
         Description="$placeholder$"
-        BackgroundColor="transparent"
         Square150x150Logo="$placeholder$.png"
-        Square44x44Logo="$placeholder$.png">
-        <uap:DefaultTile
-          Wide310x150Logo="$placeholder$.png"
-          Square71x71Logo="$placeholder$.png"
-          Square310x310Logo="$placeholder$.png">
-        </uap:DefaultTile >
+        Square44x44Logo="$placeholder$.png"
+        BackgroundColor="transparent">
+        <uap:DefaultTile Square71x71Logo="$placeholder$.png" Wide310x150Logo="$placeholder$.png" Square310x310Logo="$placeholder$.png" />
         <uap:SplashScreen Image="$placeholder$.png" />
       </uap:VisualElements>
     </Application>
diff --git a/src/Sample/SextantSample.Maui/Platforms/Windows/app.manifest b/Samples/SextantSample.Maui/Platforms/Windows/app.manifest
similarity index 100%
rename from src/Sample/SextantSample.Maui/Platforms/Windows/app.manifest
rename to Samples/SextantSample.Maui/Platforms/Windows/app.manifest
diff --git a/Samples/SextantSample.Maui/Platforms/iOS/AppDelegate.cs b/Samples/SextantSample.Maui/Platforms/iOS/AppDelegate.cs
new file mode 100644
index 00000000..8e6aaae5
--- /dev/null
+++ b/Samples/SextantSample.Maui/Platforms/iOS/AppDelegate.cs
@@ -0,0 +1,10 @@
+using Foundation;
+
+namespace SextantSample.Maui
+{
+    [Register("AppDelegate")]
+    public class AppDelegate : MauiUIApplicationDelegate
+    {
+        protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
+    }
+}
diff --git a/src/Sample/SextantSample.Maui/Platforms/MacCatalyst/Info.plist b/Samples/SextantSample.Maui/Platforms/iOS/Info.plist
similarity index 96%
rename from src/Sample/SextantSample.Maui/Platforms/MacCatalyst/Info.plist
rename to Samples/SextantSample.Maui/Platforms/iOS/Info.plist
index c96dd0a2..0004a4fd 100644
--- a/src/Sample/SextantSample.Maui/Platforms/MacCatalyst/Info.plist
+++ b/Samples/SextantSample.Maui/Platforms/iOS/Info.plist
@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
 	<key>UIDeviceFamily</key>
 	<array>
 		<integer>1</integer>
diff --git a/Samples/SextantSample.Maui/Platforms/iOS/Program.cs b/Samples/SextantSample.Maui/Platforms/iOS/Program.cs
new file mode 100644
index 00000000..292017fd
--- /dev/null
+++ b/Samples/SextantSample.Maui/Platforms/iOS/Program.cs
@@ -0,0 +1,10 @@
+using UIKit;
+
+namespace SextantSample.Maui
+{
+    public static class Program
+    {
+        // This is the main entry point of the application.
+        static void Main(string[] args) => UIApplication.Main(args, null, typeof(AppDelegate));
+    }
+}
diff --git a/src/Sample/SextantSample.Maui/Properties/launchSettings.json b/Samples/SextantSample.Maui/Properties/launchSettings.json
similarity index 100%
rename from src/Sample/SextantSample.Maui/Properties/launchSettings.json
rename to Samples/SextantSample.Maui/Properties/launchSettings.json
diff --git a/src/Sample/SextantSample.Maui/Resources/AppIcon/appicon.svg b/Samples/SextantSample.Maui/Resources/AppIcon/appicon.svg
similarity index 100%
rename from src/Sample/SextantSample.Maui/Resources/AppIcon/appicon.svg
rename to Samples/SextantSample.Maui/Resources/AppIcon/appicon.svg
diff --git a/src/Sample/SextantSample.Maui/Resources/AppIcon/appiconfg.svg b/Samples/SextantSample.Maui/Resources/AppIcon/appiconfg.svg
similarity index 100%
rename from src/Sample/SextantSample.Maui/Resources/AppIcon/appiconfg.svg
rename to Samples/SextantSample.Maui/Resources/AppIcon/appiconfg.svg
diff --git a/Samples/SextantSample.Maui/Resources/Fonts/OpenSans-Regular.ttf b/Samples/SextantSample.Maui/Resources/Fonts/OpenSans-Regular.ttf
new file mode 100644
index 00000000..4d9bd713
--- /dev/null
+++ b/Samples/SextantSample.Maui/Resources/Fonts/OpenSans-Regular.ttf
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d0ab9264819683234ff724d96538ae548f0f6fbb2df8ad73db1221a06523a5e4
+size 107168
diff --git a/Samples/SextantSample.Maui/Resources/Fonts/OpenSans-Semibold.ttf b/Samples/SextantSample.Maui/Resources/Fonts/OpenSans-Semibold.ttf
new file mode 100644
index 00000000..3806b5b1
--- /dev/null
+++ b/Samples/SextantSample.Maui/Resources/Fonts/OpenSans-Semibold.ttf
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8859d10e78e10c0fa23078c91d4320148953dd8f463ac03a676aa5315ca3dc67
+size 111072
diff --git a/Samples/SextantSample.Maui/Resources/Images/dotnet_bot.png b/Samples/SextantSample.Maui/Resources/Images/dotnet_bot.png
new file mode 100644
index 00000000..5e8655d5
--- /dev/null
+++ b/Samples/SextantSample.Maui/Resources/Images/dotnet_bot.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:46b44df1a69e178a57c7f928dc39636aa29b35bca2c864752440b9c340b3726c
+size 69811
diff --git a/src/Sample/SextantSample.Maui/Resources/Raw/AboutAssets.txt b/Samples/SextantSample.Maui/Resources/Raw/AboutAssets.txt
similarity index 86%
rename from src/Sample/SextantSample.Maui/Resources/Raw/AboutAssets.txt
rename to Samples/SextantSample.Maui/Resources/Raw/AboutAssets.txt
index 15d62448..89dc758d 100644
--- a/src/Sample/SextantSample.Maui/Resources/Raw/AboutAssets.txt
+++ b/Samples/SextantSample.Maui/Resources/Raw/AboutAssets.txt
@@ -4,7 +4,7 @@ is automatically handled by the following `MauiAsset` Build Action within your `
 
 	<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
 
-These files will be deployed with you package and will be accessible using Essentials:
+These files will be deployed with your package and will be accessible using Essentials:
 
 	async Task LoadMauiAsset()
 	{
diff --git a/src/Sample/SextantSample.Maui/Resources/Splash/splash.svg b/Samples/SextantSample.Maui/Resources/Splash/splash.svg
similarity index 100%
rename from src/Sample/SextantSample.Maui/Resources/Splash/splash.svg
rename to Samples/SextantSample.Maui/Resources/Splash/splash.svg
diff --git a/src/Sample/SextantSample.Maui/Resources/Styles/Colors.xaml b/Samples/SextantSample.Maui/Resources/Styles/Colors.xaml
similarity index 80%
rename from src/Sample/SextantSample.Maui/Resources/Styles/Colors.xaml
rename to Samples/SextantSample.Maui/Resources/Styles/Colors.xaml
index 245758ba..30307a5d 100644
--- a/src/Sample/SextantSample.Maui/Resources/Styles/Colors.xaml
+++ b/Samples/SextantSample.Maui/Resources/Styles/Colors.xaml
@@ -4,11 +4,21 @@
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
 
+    <!-- Note: For Android please see also Platforms\Android\Resources\values\colors.xml -->
+
     <Color x:Key="Primary">#512BD4</Color>
+    <Color x:Key="PrimaryDark">#ac99ea</Color>
+    <Color x:Key="PrimaryDarkText">#242424</Color>
     <Color x:Key="Secondary">#DFD8F7</Color>
+    <Color x:Key="SecondaryDarkText">#9880e5</Color>
     <Color x:Key="Tertiary">#2B0B98</Color>
+
     <Color x:Key="White">White</Color>
     <Color x:Key="Black">Black</Color>
+    <Color x:Key="Magenta">#D600AA</Color>
+    <Color x:Key="MidnightBlue">#190649</Color>
+    <Color x:Key="OffBlack">#1f1f1f</Color>
+
     <Color x:Key="Gray100">#E1E1E1</Color>
     <Color x:Key="Gray200">#C8C8C8</Color>
     <Color x:Key="Gray300">#ACACAC</Color>
@@ -17,11 +27,13 @@
     <Color x:Key="Gray600">#404040</Color>
     <Color x:Key="Gray900">#212121</Color>
     <Color x:Key="Gray950">#141414</Color>
+
     <SolidColorBrush x:Key="PrimaryBrush" Color="{StaticResource Primary}"/>
     <SolidColorBrush x:Key="SecondaryBrush" Color="{StaticResource Secondary}"/>
     <SolidColorBrush x:Key="TertiaryBrush" Color="{StaticResource Tertiary}"/>
     <SolidColorBrush x:Key="WhiteBrush" Color="{StaticResource White}"/>
     <SolidColorBrush x:Key="BlackBrush" Color="{StaticResource Black}"/>
+
     <SolidColorBrush x:Key="Gray100Brush" Color="{StaticResource Gray100}"/>
     <SolidColorBrush x:Key="Gray200Brush" Color="{StaticResource Gray200}"/>
     <SolidColorBrush x:Key="Gray300Brush" Color="{StaticResource Gray300}"/>
@@ -30,15 +42,4 @@
     <SolidColorBrush x:Key="Gray600Brush" Color="{StaticResource Gray600}"/>
     <SolidColorBrush x:Key="Gray900Brush" Color="{StaticResource Gray900}"/>
     <SolidColorBrush x:Key="Gray950Brush" Color="{StaticResource Gray950}"/>
-
-    <Color x:Key="Yellow100Accent">#F7B548</Color>
-    <Color x:Key="Yellow200Accent">#FFD590</Color>
-    <Color x:Key="Yellow300Accent">#FFE5B9</Color>
-    <Color x:Key="Cyan100Accent">#28C2D1</Color>
-    <Color x:Key="Cyan200Accent">#7BDDEF</Color>
-    <Color x:Key="Cyan300Accent">#C3F2F4</Color>
-    <Color x:Key="Blue100Accent">#3E8EED</Color>
-    <Color x:Key="Blue200Accent">#72ACF1</Color>
-    <Color x:Key="Blue300Accent">#A7CBF6</Color>
-
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Sample/SextantSample.Maui/Resources/Styles/Styles.xaml b/Samples/SextantSample.Maui/Resources/Styles/Styles.xaml
similarity index 91%
rename from src/Sample/SextantSample.Maui/Resources/Styles/Styles.xaml
rename to Samples/SextantSample.Maui/Resources/Styles/Styles.xaml
index dc4a0347..19ceac51 100644
--- a/src/Sample/SextantSample.Maui/Resources/Styles/Styles.xaml
+++ b/Samples/SextantSample.Maui/Resources/Styles/Styles.xaml
@@ -20,14 +20,15 @@
     </Style>
 
     <Style TargetType="BoxView">
-        <Setter Property="Color" Value="{AppThemeBinding Light={StaticResource Gray950}, Dark={StaticResource Gray200}}" />
+        <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource Gray950}, Dark={StaticResource Gray200}}" />
     </Style>
 
     <Style TargetType="Button">
-        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Primary}}" />
-        <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
+        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource PrimaryDarkText}}" />
+        <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource PrimaryDark}}" />
         <Setter Property="FontFamily" Value="OpenSansRegular"/>
         <Setter Property="FontSize" Value="14"/>
+        <Setter Property="BorderWidth" Value="0"/>
         <Setter Property="CornerRadius" Value="8"/>
         <Setter Property="Padding" Value="14,10"/>
         <Setter Property="MinimumHeightRequest" Value="44"/>
@@ -42,6 +43,7 @@
                             <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray600}}" />
                         </VisualState.Setters>
                     </VisualState>
+                    <VisualState x:Name="PointerOver" />
                 </VisualStateGroup>
             </VisualStateGroupList>
         </Setter>
@@ -152,13 +154,14 @@
                             <Setter Property="Opacity" Value="0.5" />
                         </VisualState.Setters>
                     </VisualState>
+                    <VisualState x:Name="PointerOver" />
                 </VisualStateGroup>
             </VisualStateGroupList>
         </Setter>
     </Style>
 
     <Style TargetType="Label">
-        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" />
+        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" />
         <Setter Property="BackgroundColor" Value="Transparent" />
         <Setter Property="FontFamily" Value="OpenSansRegular" />
         <Setter Property="FontSize" Value="14" />
@@ -176,6 +179,24 @@
         </Setter>
     </Style>
 
+    <Style TargetType="Span">
+        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" />
+    </Style>
+
+    <Style TargetType="Label" x:Key="Headline">
+        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource MidnightBlue}, Dark={StaticResource White}}" />
+        <Setter Property="FontSize" Value="32" />
+        <Setter Property="HorizontalOptions" Value="Center" />
+        <Setter Property="HorizontalTextAlignment" Value="Center" />
+    </Style>
+
+    <Style TargetType="Label" x:Key="SubHeadline">
+        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource MidnightBlue}, Dark={StaticResource White}}" />
+        <Setter Property="FontSize" Value="24" />
+        <Setter Property="HorizontalOptions" Value="Center" />
+        <Setter Property="HorizontalTextAlignment" Value="Center" />
+    </Style>
+
     <Style TargetType="ListView">
         <Setter Property="SeparatorColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}" />
         <Setter Property="RefreshControlColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray200}}" />
@@ -373,31 +394,31 @@
 
     <Style TargetType="Page" ApplyToDerivedTypes="True">
         <Setter Property="Padding" Value="0"/>
-        <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Black}}" />
+        <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource OffBlack}}" />
     </Style>
 
     <Style TargetType="Shell" ApplyToDerivedTypes="True">
-        <Setter Property="Shell.BackgroundColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource Gray950}}" />
-        <Setter Property="Shell.ForegroundColor" Value="{OnPlatform WinUI={StaticResource Primary}, Default={StaticResource White}}" />
-        <Setter Property="Shell.TitleColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource White}}" />
+        <Setter Property="Shell.BackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource OffBlack}}" />
+        <Setter Property="Shell.ForegroundColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource SecondaryDarkText}}" />
+        <Setter Property="Shell.TitleColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource SecondaryDarkText}}" />
         <Setter Property="Shell.DisabledColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray950}}" />
         <Setter Property="Shell.UnselectedColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray200}}" />
         <Setter Property="Shell.NavBarHasShadow" Value="False" />
         <Setter Property="Shell.TabBarBackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Black}}" />
-        <Setter Property="Shell.TabBarForegroundColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
-        <Setter Property="Shell.TabBarTitleColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
+        <Setter Property="Shell.TabBarForegroundColor" Value="{AppThemeBinding Light={StaticResource Magenta}, Dark={StaticResource White}}" />
+        <Setter Property="Shell.TabBarTitleColor" Value="{AppThemeBinding Light={StaticResource Magenta}, Dark={StaticResource White}}" />
         <Setter Property="Shell.TabBarUnselectedColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray200}}" />
     </Style>
 
     <Style TargetType="NavigationPage">
-        <Setter Property="BarBackgroundColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource Gray950}}" />
+        <Setter Property="BarBackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource OffBlack}}" />
         <Setter Property="BarTextColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource White}}" />
         <Setter Property="IconColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource White}}" />
     </Style>
 
     <Style TargetType="TabbedPage">
         <Setter Property="BarBackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Gray950}}" />
-        <Setter Property="BarTextColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
+        <Setter Property="BarTextColor" Value="{AppThemeBinding Light={StaticResource Magenta}, Dark={StaticResource White}}" />
         <Setter Property="UnselectedTabColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray950}}" />
         <Setter Property="SelectedTabColor" Value="{AppThemeBinding Light={StaticResource Gray950}, Dark={StaticResource Gray200}}" />
     </Style>
diff --git a/Samples/SextantSample.Maui/SextantSample.Maui.csproj b/Samples/SextantSample.Maui/SextantSample.Maui.csproj
new file mode 100644
index 00000000..3a915d29
--- /dev/null
+++ b/Samples/SextantSample.Maui/SextantSample.Maui.csproj
@@ -0,0 +1,64 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net8.0-android;net8.0-ios</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
+    <OutputType>Exe</OutputType>
+    <UseMaui>true</UseMaui>
+    <SingleProject>true</SingleProject>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <IsPackable>false</IsPackable>
+    <PublishReadyToRun>false</PublishReadyToRun>
+    <!-- Display name -->
+    <ApplicationTitle>SextantSample.Maui</ApplicationTitle>
+
+    <!-- App Identifier -->
+    <ApplicationId>com.companyname.sextantsample.maui</ApplicationId>
+
+    <!-- Versions -->
+    <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
+    <ApplicationVersion>1</ApplicationVersion>
+
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
+    <TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
+    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
+    <Platforms>x64</Platforms>
+  </PropertyGroup>
+  <PropertyGroup Condition="$(TargetFramework.Contains('-windows'))">
+    <RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
+  </PropertyGroup>
+  <ItemGroup>
+    <!-- App Icon -->
+    <MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
+
+    <!-- Splash Screen -->
+    <MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />
+
+    <!-- Images -->
+    <MauiImage Include="Resources\Images\*" />
+    <MauiImage Update="Resources\Images\dotnet_bot.png" Resize="True" BaseSize="300,185" />
+
+    <!-- Custom Fonts -->
+    <MauiFont Include="Resources\Fonts\*" />
+
+    <!-- Raw Assets (also remove the "Resources\Raw" prefix) -->
+    <MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
+    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
+    <PackageReference Include="Roslynator.Analyzers" Version="4.12.3" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.6.133" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Sample\SextantSample.Core\SextantSample.ViewModels.csproj" />
+    <ProjectReference Include="..\..\src\Sextant.Maui\Sextant.Maui.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Sample/SextantSample.Maui/Views/BlueNavigationView.cs b/Samples/SextantSample.Maui/Views/BlueNavigationView.cs
similarity index 100%
rename from src/Sample/SextantSample.Maui/Views/BlueNavigationView.cs
rename to Samples/SextantSample.Maui/Views/BlueNavigationView.cs
diff --git a/src/Sample/SextantSample.Maui/Views/FirstModalView.xaml b/Samples/SextantSample.Maui/Views/FirstModalView.xaml
similarity index 100%
rename from src/Sample/SextantSample.Maui/Views/FirstModalView.xaml
rename to Samples/SextantSample.Maui/Views/FirstModalView.xaml
diff --git a/src/Sample/SextantSample.Maui/Views/FirstModalView.xaml.cs b/Samples/SextantSample.Maui/Views/FirstModalView.xaml.cs
similarity index 100%
rename from src/Sample/SextantSample.Maui/Views/FirstModalView.xaml.cs
rename to Samples/SextantSample.Maui/Views/FirstModalView.xaml.cs
diff --git a/src/Sample/SextantSample.Maui/Views/GreenView.xaml b/Samples/SextantSample.Maui/Views/GreenView.xaml
similarity index 100%
rename from src/Sample/SextantSample.Maui/Views/GreenView.xaml
rename to Samples/SextantSample.Maui/Views/GreenView.xaml
diff --git a/src/Sample/SextantSample.Maui/Views/GreenView.xaml.cs b/Samples/SextantSample.Maui/Views/GreenView.xaml.cs
similarity index 100%
rename from src/Sample/SextantSample.Maui/Views/GreenView.xaml.cs
rename to Samples/SextantSample.Maui/Views/GreenView.xaml.cs
diff --git a/src/Sample/SextantSample.Maui/Views/HomeView.xaml b/Samples/SextantSample.Maui/Views/HomeView.xaml
similarity index 100%
rename from src/Sample/SextantSample.Maui/Views/HomeView.xaml
rename to Samples/SextantSample.Maui/Views/HomeView.xaml
diff --git a/src/Sample/SextantSample.Maui/Views/HomeView.xaml.cs b/Samples/SextantSample.Maui/Views/HomeView.xaml.cs
similarity index 100%
rename from src/Sample/SextantSample.Maui/Views/HomeView.xaml.cs
rename to Samples/SextantSample.Maui/Views/HomeView.xaml.cs
diff --git a/src/Sample/SextantSample.Maui/Views/RedView.xaml b/Samples/SextantSample.Maui/Views/RedView.xaml
similarity index 100%
rename from src/Sample/SextantSample.Maui/Views/RedView.xaml
rename to Samples/SextantSample.Maui/Views/RedView.xaml
diff --git a/src/Sample/SextantSample.Maui/Views/RedView.xaml.cs b/Samples/SextantSample.Maui/Views/RedView.xaml.cs
similarity index 100%
rename from src/Sample/SextantSample.Maui/Views/RedView.xaml.cs
rename to Samples/SextantSample.Maui/Views/RedView.xaml.cs
diff --git a/src/Sample/SextantSample.Maui/Views/SecondModalView.xaml b/Samples/SextantSample.Maui/Views/SecondModalView.xaml
similarity index 100%
rename from src/Sample/SextantSample.Maui/Views/SecondModalView.xaml
rename to Samples/SextantSample.Maui/Views/SecondModalView.xaml
diff --git a/src/Sample/SextantSample.Maui/Views/SecondModalView.xaml.cs b/Samples/SextantSample.Maui/Views/SecondModalView.xaml.cs
similarity index 100%
rename from src/Sample/SextantSample.Maui/Views/SecondModalView.xaml.cs
rename to Samples/SextantSample.Maui/Views/SecondModalView.xaml.cs
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index 3f797b26..f926d20d 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -5,8 +5,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <AvaloniaVersion>11.0.10</AvaloniaVersion>
-    <ReactiveUIVersion>19.6.12</ReactiveUIVersion>
-    <RxVersion>6.0.0</RxVersion>
+    <ReactiveUIVersion>20.1.1</ReactiveUIVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="Avalonia" Version="$(AvaloniaVersion)" />
@@ -15,10 +14,10 @@
     <PackageVersion Include="Citrus.Avalonia" Version="2.1.1" />
     <PackageVersion Include="MessageBox.Avalonia" Version="3.1.5.1" />
     <PackageVersion Include="coverlet.msbuild" Version="6.0.2" />
-    <PackageVersion Include="DiffEngine" Version="15.4.0" />
+    <PackageVersion Include="DiffEngine" Version="15.4.1" />
     <PackageVersion Include="FluentAssertions" Version="6.12.0" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageVersion Include="Microsoft.Reactive.Testing" Version="$(RxVersion)" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageVersion Include="Microsoft.Reactive.Testing" Version="6.0.1" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
     <PackageVersion Include="Nerdbank.GitVersioning" Version="3.6.133" />
@@ -29,22 +28,18 @@
     <PackageVersion Include="ReactiveUI.Testing" Version="$(ReactiveUIVersion)" />
     <PackageVersion Include="ReactiveUI.XamForms" Version="$(ReactiveUIVersion)" />
     <PackageVersion Include="ReactiveUI.WPF" Version="$(ReactiveUIVersion)" />
-    <PackageVersion Include="Rg.Plugins.Popup" Version="2.1.0" />
+    <PackageVersion Include="Mopups" Version="1.3.1" />
     <PackageVersion Include="Roslynator.Analyzers" Version="4.12.3" />
     <PackageVersion Include="stylecop.analyzers" Version="1.2.0-beta.556" />
     <PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
     <PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
-    <PackageVersion Include="System.Reactive" Version="$(RxVersion)" />
     <PackageVersion Include="Verify.Xunit" Version="24.2.0" />
-    <PackageVersion Include="Xamarin.Forms" Version="5.0.0.2662" />
-    <PackageVersion Include="Xamarin.Forms.Mocks" Version="4.7.0.1" />
-    <PackageVersion Include="Xamarin.Forms.Platform.WPF" Version="5.0.0.2662" />
-    <PackageVersion Include="xunit" Version="2.8.0" />
+    <PackageVersion Include="xunit" Version="2.8.1" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.1" />
     <PackageVersion Include="xunit.runner.devices" Version="2.5.25" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.0" />
     <PackageVersion Include="Xunit.StaFact" Version="1.1.11" />
   </ItemGroup>
-  <ItemGroup Condition="$(TargetFramework.StartsWith('net8'))">
+  <ItemGroup Condition="$(UseMaui) == 'true'">
     <PackageVersion Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
     <PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
   </ItemGroup>
diff --git a/src/Directory.build.props b/src/Directory.build.props
index df85e48e..b291338f 100644
--- a/src/Directory.build.props
+++ b/src/Directory.build.props
@@ -23,6 +23,7 @@
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
     <WarningsAsErrors>CS8600;CS8602;CS8603;CS8604;CS8605;CS8606;CS8607;CS8608;CS8609;CS8610;CS8611;CS8612;CS8613;CS8614;CS8615;CS8616;CS8617;CS8618;CS8619;CS8620;CS8621;CS8622;CS8623;CS8624;CS8625;CS8626;CS8627;CS8628;CS8629;CS8630;CS8634;CS8766;CS8767</WarningsAsErrors>
     <LangVersion>preview</LangVersion>
+    <Nullable>enable</Nullable>
     <EnableNETAnalyzers>True</EnableNETAnalyzers>
     <AnalysisLevel>latest</AnalysisLevel>
     <WarningsAsErrors>nullable</WarningsAsErrors>
@@ -36,15 +37,21 @@
   <ItemGroup Condition="'$(IsTestProject)' != 'true'">
     <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
   </ItemGroup>
+
+  <ItemGroup Condition="$(UseMaui) == 'true'">
+    <PackageReference Include="Microsoft.Maui.Controls" />
+    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" />
+  </ItemGroup>
+
   <ItemGroup Condition="$(IsTestProject)">
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="xunit" />
     <PackageReference Include="xunit.runner.visualstudio" />
     <PackageReference Include="Xunit.StaFact" />
-    <PackageReference Include="Xamarin.Forms.Mocks" />
     <PackageReference Include="DiffEngine" />
     <PackageReference Include="FluentAssertions" />
     <PackageReference Include="ReactiveUI.Testing" />
+    <PackageReference Include="Microsoft.Reactive.Testing" />
     <PackageReference Include="Verify.Xunit" />
     <PackageReference Include="PublicApiGenerator" />
     <PackageReference Include="NSubstitute" />
diff --git a/src/Directory.build.targets b/src/Directory.build.targets
index 8c56efb8..2528d8dd 100644
--- a/src/Directory.build.targets
+++ b/src/Directory.build.targets
@@ -10,69 +10,20 @@
   <PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
     <DefineConstants>$(DefineConstants);NET_461;XAML</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition="$(TargetFramework.StartsWith('Xamarin.iOS'))">
+  <PropertyGroup Condition="$(TargetFramework.EndsWith('-ios'))">
     <DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;IOS</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition="$(TargetFramework.StartsWith('net6.0-ios'))">
+  <PropertyGroup Condition="$(TargetFramework.EndsWith('-maccatalyst'))">
     <DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;IOS</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition="$(TargetFramework.StartsWith('net6.0-maccatalyst'))">
-    <DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;IOS</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="$(TargetFramework.StartsWith('net7.0-ios'))">
-    <DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;IOS</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="$(TargetFramework.StartsWith('net7.0-maccatalyst'))">
-    <DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;IOS</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="$(TargetFramework.StartsWith('net8.0-ios'))">
-    <DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;IOS</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="$(TargetFramework.StartsWith('net8.0-maccatalyst'))">
-    <DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;IOS</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="$(TargetFramework.StartsWith('Xamarin.Mac'))">
-    <DefineConstants>$(DefineConstants);MONO;COCOA;MAC</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="$(TargetFramework.StartsWith('net6.0-macos'))">
-    <DefineConstants>$(DefineConstants);MONO;COCOA;MAC</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="$(TargetFramework.StartsWith('net7.0-macos'))">
-    <DefineConstants>$(DefineConstants);MONO;COCOA;MAC</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="$(TargetFramework.StartsWith('net8.0-macos'))">
+  <PropertyGroup Condition="$(TargetFramework.EndsWith('-macos'))">
     <DefineConstants>$(DefineConstants);MONO;COCOA;MAC</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition="$(TargetFramework.StartsWith('Xamarin.TVOS'))">
-    <DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;TVOS</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="$(TargetFramework.StartsWith('net6.0-tvos'))">
-    <DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;TVOS</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="$(TargetFramework.StartsWith('net7.0-tvos'))">
-    <DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;TVOS</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="$(TargetFramework.StartsWith('net8.0-tvos'))">
+  <PropertyGroup Condition="$(TargetFramework.EndsWith('-tvos'))">
     <DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;TVOS</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition="$(TargetFramework.StartsWith('Xamarin.WatchOS'))">
-    <DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;WATCHOS</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="$(TargetFramework.StartsWith('MonoAndroid'))">
+  <PropertyGroup Condition="$(TargetFramework.EndsWith('-android'))">
     <DefineConstants>$(DefineConstants);MONO;ANDROID</DefineConstants>
-    <DesignTimeBuild>false</DesignTimeBuild>
-  </PropertyGroup>
-  <PropertyGroup Condition="$(TargetFramework.StartsWith('net6.0-android'))">
-    <DefineConstants>$(DefineConstants);MONO;ANDROID</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="$(TargetFramework.StartsWith('net7.0-android'))">
-    <DefineConstants>$(DefineConstants);MONO;ANDROID</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="$(TargetFramework.StartsWith('net8.0-android'))">
-    <DefineConstants>$(DefineConstants);MONO;ANDROID</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="$(TargetFramework.StartsWith('tizen'))">
-    <DefineConstants>$(DefineConstants);TIZEN</DefineConstants>
   </PropertyGroup>
  
 </Project>
diff --git a/src/Sample/SextantSample.Android/Assets/AboutAssets.txt b/src/Sample/SextantSample.Android/Assets/AboutAssets.txt
deleted file mode 100644
index 81b5afc7..00000000
--- a/src/Sample/SextantSample.Android/Assets/AboutAssets.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Any raw assets you want to be deployed with your application can be placed in
-this directory (and child directories) and given a Build Action of "AndroidAsset".
-
-These files will be deployed with you package and will be accessible using Android's
-AssetManager, like this:
-
-public class ReadAsset : Activity
-{
- protected override void OnCreate (Bundle bundle)
- {
-     base.OnCreate (bundle);
-
-     InputStream input = Assets.Open ("my_asset.txt");
- }
-}
-
-Additionally, some Android functions will automatically load asset files:
-
-Typeface tf = Typeface.CreateFromAsset (Context.Assets, "fonts/samplefont.ttf");
diff --git a/src/Sample/SextantSample.Android/MainActivity.cs b/src/Sample/SextantSample.Android/MainActivity.cs
deleted file mode 100644
index b169c606..00000000
--- a/src/Sample/SextantSample.Android/MainActivity.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-
-using Android.App;
-using Android.Content.PM;
-using Android.OS;
-
-namespace SextantSample.Droid;
-
-[Activity(Label = "SextantSample", Icon = "@mipmap/icon", Theme = "@style/MainTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
-public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity
-{
-    protected override void OnCreate(Bundle bundle)
-    {
-        TabLayoutResource = Resource.Layout.Tabbar;
-        ToolbarResource = Resource.Layout.Toolbar;
-
-        base.OnCreate(bundle);
-
-        Xamarin.Forms.Forms.Init(this, bundle);
-        LoadApplication(new App());
-    }
-}
diff --git a/src/Sample/SextantSample.Android/Properties/AndroidManifest.xml b/src/Sample/SextantSample.Android/Properties/AndroidManifest.xml
deleted file mode 100644
index da365097..00000000
--- a/src/Sample/SextantSample.Android/Properties/AndroidManifest.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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="com.giusepe.SextantSample" android:installLocation="auto">
-	<uses-sdk android:minSdkVersion="28" android:targetSdkVersion="33" />
-	<application android:label="SextantSample.Android"></application>
-</manifest>
\ No newline at end of file
diff --git a/src/Sample/SextantSample.Android/Properties/AssemblyInfo.cs b/src/Sample/SextantSample.Android/Properties/AssemblyInfo.cs
deleted file mode 100644
index 946cb6f0..00000000
--- a/src/Sample/SextantSample.Android/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using Android.App;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("SextantSample.Android")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("SextantSample.Android")]
-[assembly: AssemblyCopyright("Copyright ©  2014")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: ComVisible(false)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-// [assembly: AssemblyVersion("1.0.0.0")]
-// [assembly: AssemblyFileVersion("1.0.0.0")]
-
-// Add some common permissions, these can be removed if not needed
-[assembly: UsesPermission(Android.Manifest.Permission.Internet)]
-[assembly: UsesPermission(Android.Manifest.Permission.WriteExternalStorage)]
diff --git a/src/Sample/SextantSample.Android/Resources/AboutResources.txt b/src/Sample/SextantSample.Android/Resources/AboutResources.txt
deleted file mode 100644
index cb30f20b..00000000
--- a/src/Sample/SextantSample.Android/Resources/AboutResources.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-Images, layout descriptions, binary blobs and string dictionaries can be included 
-in your application as resource files.  Various Android APIs are designed to 
-operate on the resource IDs instead of dealing with images, strings or binary blobs 
-directly.
-
-For example, a sample Android app that contains a user interface layout (main.xml),
-an internationalization string table (strings.xml) and some icons (drawable-XXX/icon.png) 
-would keep its resources in the "Resources" directory of the application:
-
-Resources/
-    drawable-hdpi/
-        icon.png
-
-    drawable-ldpi/
-        icon.png
-
-    drawable-mdpi/
-        icon.png
-
-    layout/
-        main.xml
-
-    values/
-        strings.xml
-
-In order to get the build system to recognize Android resources, set the build action to
-"AndroidResource".  The native Android APIs do not operate directly with filenames, but 
-instead operate on resource IDs.  When you compile an Android application that uses resources, 
-the build system will package the resources for distribution and generate a class called
-"Resource" that contains the tokens for each one of the resources included. For example, 
-for the above Resources layout, this is what the Resource class would expose:
-
-public class Resource {
-    public class drawable {
-        public const int icon = 0x123;
-    }
-
-    public class layout {
-        public const int main = 0x456;
-    }
-
-    public class strings {
-        public const int first_string = 0xabc;
-        public const int second_string = 0xbcd;
-    }
-}
-
-You would then use R.drawable.icon to reference the drawable/icon.png file, or Resource.layout.main 
-to reference the layout/main.xml file, or Resource.strings.first_string to reference the first 
-string in the dictionary file values/strings.xml.
diff --git a/src/Sample/SextantSample.Android/Resources/drawable/xamarin_logo.png b/src/Sample/SextantSample.Android/Resources/drawable/xamarin_logo.png
deleted file mode 100644
index 6befe10f..00000000
--- a/src/Sample/SextantSample.Android/Resources/drawable/xamarin_logo.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ea73ef57fbb8e1e93f7effee76c3a3109146b878dd691ebce5560d7c38bde01d
-size 21481
diff --git a/src/Sample/SextantSample.Android/Resources/layout/Tabbar.axml b/src/Sample/SextantSample.Android/Resources/layout/Tabbar.axml
deleted file mode 100644
index 900ce3cc..00000000
--- a/src/Sample/SextantSample.Android/Resources/layout/Tabbar.axml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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.MaterialComponents.ActionBar"
-    app:tabIndicatorColor="@android:color/white"
-    app:tabGravity="fill"
-    app:tabMode="fixed" />
diff --git a/src/Sample/SextantSample.Android/Resources/layout/Toolbar.axml b/src/Sample/SextantSample.Android/Resources/layout/Toolbar.axml
deleted file mode 100644
index aabd0a3b..00000000
--- a/src/Sample/SextantSample.Android/Resources/layout/Toolbar.axml
+++ /dev/null
@@ -1,9 +0,0 @@
-<android.support.v7.widget.Toolbar
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/toolbar"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?attr/colorPrimary"
-    android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-    android:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
-
diff --git a/src/Sample/SextantSample.Android/Resources/mipmap-anydpi-v26/icon.xml b/src/Sample/SextantSample.Android/Resources/mipmap-anydpi-v26/icon.xml
deleted file mode 100644
index 88d1d0a1..00000000
--- a/src/Sample/SextantSample.Android/Resources/mipmap-anydpi-v26/icon.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/launcher_background" />
-    <foreground android:drawable="@mipmap/launcher_foreground" />
-</adaptive-icon>
\ No newline at end of file
diff --git a/src/Sample/SextantSample.Android/Resources/mipmap-anydpi-v26/icon_round.xml b/src/Sample/SextantSample.Android/Resources/mipmap-anydpi-v26/icon_round.xml
deleted file mode 100644
index 88d1d0a1..00000000
--- a/src/Sample/SextantSample.Android/Resources/mipmap-anydpi-v26/icon_round.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/launcher_background" />
-    <foreground android:drawable="@mipmap/launcher_foreground" />
-</adaptive-icon>
\ No newline at end of file
diff --git a/src/Sample/SextantSample.Android/Resources/mipmap-hdpi/Icon.png b/src/Sample/SextantSample.Android/Resources/mipmap-hdpi/Icon.png
deleted file mode 100644
index b7990051..00000000
--- a/src/Sample/SextantSample.Android/Resources/mipmap-hdpi/Icon.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a5bb656d9c5f9d702ab1b7fb2c3ea6d4855fdcdf7592b8affa37a0f7c788efe7
-size 4754
diff --git a/src/Sample/SextantSample.Android/Resources/mipmap-hdpi/launcher_foreground.png b/src/Sample/SextantSample.Android/Resources/mipmap-hdpi/launcher_foreground.png
deleted file mode 100644
index 50421b21..00000000
--- a/src/Sample/SextantSample.Android/Resources/mipmap-hdpi/launcher_foreground.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:992d032e705646cd3be0fb83873074c9b1dcb0673c05307953d72679a37b65f4
-size 11695
diff --git a/src/Sample/SextantSample.Android/Resources/mipmap-mdpi/icon.png b/src/Sample/SextantSample.Android/Resources/mipmap-mdpi/icon.png
deleted file mode 100644
index 6669aaa9..00000000
--- a/src/Sample/SextantSample.Android/Resources/mipmap-mdpi/icon.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:54f2cbea5af45cc7a4fe7d4c80841c8be270e8e4e337201ff2422ecf4007e181
-size 2807
diff --git a/src/Sample/SextantSample.Android/Resources/mipmap-mdpi/launcher_foreground.png b/src/Sample/SextantSample.Android/Resources/mipmap-mdpi/launcher_foreground.png
deleted file mode 100644
index 3e396ae1..00000000
--- a/src/Sample/SextantSample.Android/Resources/mipmap-mdpi/launcher_foreground.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0dc5150f8c57eef92075a270adf3578c77cf390bea2ea161e4ef09dbf2a6e698
-size 6439
diff --git a/src/Sample/SextantSample.Android/Resources/mipmap-xhdpi/Icon.png b/src/Sample/SextantSample.Android/Resources/mipmap-xhdpi/Icon.png
deleted file mode 100644
index eed23e84..00000000
--- a/src/Sample/SextantSample.Android/Resources/mipmap-xhdpi/Icon.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5ffdb4ae78761bf99a0a43f827f42ea1a3410fc3b8537832536af712cefdb069
-size 7028
diff --git a/src/Sample/SextantSample.Android/Resources/mipmap-xhdpi/launcher_foreground.png b/src/Sample/SextantSample.Android/Resources/mipmap-xhdpi/launcher_foreground.png
deleted file mode 100644
index e43c47de..00000000
--- a/src/Sample/SextantSample.Android/Resources/mipmap-xhdpi/launcher_foreground.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3a84ead75472a8b35a9d3a25a046fd7c869880a254882e03f8b96c7d49accdf0
-size 17898
diff --git a/src/Sample/SextantSample.Android/Resources/mipmap-xxhdpi/Icon.png b/src/Sample/SextantSample.Android/Resources/mipmap-xxhdpi/Icon.png
deleted file mode 100644
index 68749366..00000000
--- a/src/Sample/SextantSample.Android/Resources/mipmap-xxhdpi/Icon.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9f3bffe7057bb1215c9764b0faa56e3a5ffa4ce3b92ce1d54c1ef106d125bcfb
-size 12827
diff --git a/src/Sample/SextantSample.Android/Resources/mipmap-xxhdpi/launcher_foreground.png b/src/Sample/SextantSample.Android/Resources/mipmap-xxhdpi/launcher_foreground.png
deleted file mode 100644
index a6c6c13d..00000000
--- a/src/Sample/SextantSample.Android/Resources/mipmap-xxhdpi/launcher_foreground.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7235e00896cbc1f3558c6199f2ca74e828bb6d444517802b1e288558748aa228
-size 33484
diff --git a/src/Sample/SextantSample.Android/Resources/mipmap-xxxhdpi/Icon.png b/src/Sample/SextantSample.Android/Resources/mipmap-xxxhdpi/Icon.png
deleted file mode 100644
index fba4eefb..00000000
--- a/src/Sample/SextantSample.Android/Resources/mipmap-xxxhdpi/Icon.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8911287772984d5bac8d0c89fcbf501285fdbf10d5a6540c1b5a4e6ccc4ff06f
-size 19380
diff --git a/src/Sample/SextantSample.Android/Resources/mipmap-xxxhdpi/launcher_foreground.png b/src/Sample/SextantSample.Android/Resources/mipmap-xxxhdpi/launcher_foreground.png
deleted file mode 100644
index 74aaa5cd..00000000
--- a/src/Sample/SextantSample.Android/Resources/mipmap-xxxhdpi/launcher_foreground.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:54d86486f9ba368807632acd6dafc7e56395a7cfe8599cb44c36a4a1a424fb96
-size 52285
diff --git a/src/Sample/SextantSample.Android/Resources/values/colors.xml b/src/Sample/SextantSample.Android/Resources/values/colors.xml
deleted file mode 100644
index d9f6e0ba..00000000
--- a/src/Sample/SextantSample.Android/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/src/Sample/SextantSample.Android/Resources/values/styles.xml b/src/Sample/SextantSample.Android/Resources/values/styles.xml
deleted file mode 100644
index 48d15fe3..00000000
--- a/src/Sample/SextantSample.Android/Resources/values/styles.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<resources>
-
-  <style name="MainTheme" parent="MainTheme.Base">
-  </style>
-  <!-- Base theme applied no matter what API -->
-  <style name="MainTheme.Base" parent="Theme.MaterialComponents.Light.DarkActionBar">
-    <!-- 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="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
-    <item name="colorAccent">#FF4081</item>
-  </style>
-</resources>
diff --git a/src/Sample/SextantSample.Android/Resources/xml/file_paths.xml b/src/Sample/SextantSample.Android/Resources/xml/file_paths.xml
deleted file mode 100644
index 90b770f7..00000000
--- a/src/Sample/SextantSample.Android/Resources/xml/file_paths.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<paths xmlns:android="http://schemas.android.com/apk/res/android">
-  <external-files-path name="my_images" path="Pictures" />
-  <external-files-path name="my_movies" path="Movies" />
-</paths>
\ No newline at end of file
diff --git a/src/Sample/SextantSample.Android/SextantSample.Android.csproj b/src/Sample/SextantSample.Android/SextantSample.Android.csproj
deleted file mode 100644
index a8809266..00000000
--- a/src/Sample/SextantSample.Android/SextantSample.Android.csproj
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{4A684BB2-2CB4-4B04-8541-FF0FA677DD49}</ProjectGuid>
-    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <TemplateGuid>{c9e5eea5-ca05-42a1-839b-61506e0a37df}</TemplateGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>SextantSample.Droid</RootNamespace>
-    <AssemblyName>SextantSample.Android</AssemblyName>
-    <AndroidApplication>True</AndroidApplication>
-    <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
-    <AndroidResgenClass>Resource</AndroidResgenClass>
-    <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
-    <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
-    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
-    <TargetFrameworkVersion>v13.0</TargetFrameworkVersion>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;LOGGING</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AndroidLinkMode>None</AndroidLinkMode>
-    <AotAssemblies>false</AotAssemblies>
-    <EnableLLVM>false</EnableLLVM>
-    <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
-    <BundleAssemblies>false</BundleAssemblies>
-    <MandroidI18n />
-    <Debugger>Xamarin</Debugger>
-    <EmbedAssembliesIntoApk>false</EmbedAssembliesIntoApk>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AndroidManagedSymbols>true</AndroidManagedSymbols>
-    <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Sample Release|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Sample Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AndroidManagedSymbols>true</AndroidManagedSymbols>
-    <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
-    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
-    <AndroidSupportedAbis>armeabi-v7a</AndroidSupportedAbis>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;LOGGING</DefineConstants>
-    <DebugType>portable</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-    <LangVersion>8.0</LangVersion>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <Optimize>true</Optimize>
-    <DebugType>portable</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-    <LangVersion>8.0</LangVersion>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Sample Release|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Sample Release\</OutputPath>
-    <Optimize>true</Optimize>
-    <DebugType>portable</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-    <LangVersion>8.0</LangVersion>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Mono.Android" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="ReactiveUI.XamForms" />
-    <PackageReference Include="System.Threading.Tasks.Extensions" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="MainActivity.cs" />
-    <Compile Include="Resources\Resource.Designer.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\AboutResources.txt" />
-    <None Include="Assets\AboutAssets.txt" />
-    <None Include="Properties\AndroidManifest.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\layout\Tabbar.axml" />
-    <AndroidResource Include="Resources\layout\Toolbar.axml" />
-    <AndroidResource Include="Resources\values\styles.xml" />
-    <AndroidResource Include="Resources\values\colors.xml" />
-    <AndroidResource Include="Resources\mipmap-anydpi-v26\icon.xml" />
-    <AndroidResource Include="Resources\mipmap-anydpi-v26\icon_round.xml" />
-    <AndroidResource Include="Resources\mipmap-hdpi\Icon.png" />
-    <AndroidResource Include="Resources\mipmap-hdpi\launcher_foreground.png" />
-    <AndroidResource Include="Resources\mipmap-mdpi\Icon.png" />
-    <AndroidResource Include="Resources\mipmap-mdpi\launcher_foreground.png" />
-    <AndroidResource Include="Resources\mipmap-xhdpi\Icon.png" />
-    <AndroidResource Include="Resources\mipmap-xhdpi\launcher_foreground.png" />
-    <AndroidResource Include="Resources\mipmap-xxhdpi\Icon.png" />
-    <AndroidResource Include="Resources\mipmap-xxhdpi\launcher_foreground.png" />
-    <AndroidResource Include="Resources\mipmap-xxxhdpi\Icon.png" />
-    <AndroidResource Include="Resources\mipmap-xxxhdpi\launcher_foreground.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Resources\drawable-hdpi\" />
-    <Folder Include="Resources\drawable-xhdpi\" />
-    <Folder Include="Resources\drawable-xxhdpi\" />
-    <Folder Include="Resources\drawable-xxxhdpi\" />
-    <Folder Include="Resources\drawable\" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Sextant\Sextant.csproj">
-      <Project>{4cf5e8d0-bb2c-4790-9ad5-03aec069c3c3}</Project>
-      <Name>Sextant</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\SextantSample\SextantSample.csproj">
-      <Project>{44FA03FD-7A52-41AD-9332-1B34FFDEE67B}</Project>
-      <Name>SextantSample</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-</Project>
\ No newline at end of file
diff --git a/src/Sample/SextantSample.Avalonia.sln b/src/Sample/SextantSample.Avalonia.sln
index 3f8d57c5..d38d97bb 100644
--- a/src/Sample/SextantSample.Avalonia.sln
+++ b/src/Sample/SextantSample.Avalonia.sln
@@ -3,14 +3,10 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.9.34902.65
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SextantSample", "SextantSample\SextantSample.csproj", "{AB35E5EE-24AE-479A-909E-1FD941E152EF}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sextant", "..\Sextant\Sextant.csproj", "{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SextantSample.ViewModels", "SextantSample.Core\SextantSample.ViewModels.csproj", "{5818A5AF-3FF6-4E68-80FC-604D4AEF156C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sextant.XamForms", "..\Sextant.XamForms\Sextant.XamForms.csproj", "{3A3613ED-BB0D-40CF-B0D5-A13C2F12D7BC}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sextant.Avalonia", "..\Sextant.Avalonia\Sextant.Avalonia.csproj", "{41165CA6-DE68-4DF0-A554-CD47B643F545}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SextantSample.Avalonia", "SextantSample.Avalonia\SextantSample.Avalonia.csproj", "{901979AB-BEBA-440A-BC70-9067F02B6B63}"
@@ -43,36 +39,6 @@ Global
 		Sample Release|iPhoneSimulator = Sample Release|iPhoneSimulator
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Release|iPhone.Build.0 = Release|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Sample Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Sample Release|Any CPU.Build.0 = Release|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Sample Release|iPhone.ActiveCfg = Release|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Sample Release|iPhone.Build.0 = Release|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Sample Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Sample Release|iPhoneSimulator.Build.0 = Release|Any CPU
 		{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
 		{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
 		{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
@@ -133,36 +99,6 @@ Global
 		{5818A5AF-3FF6-4E68-80FC-604D4AEF156C}.Sample Release|iPhone.Build.0 = Release|Any CPU
 		{5818A5AF-3FF6-4E68-80FC-604D4AEF156C}.Sample Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{5818A5AF-3FF6-4E68-80FC-604D4AEF156C}.Sample Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{3A3613ED-BB0D-40CF-B0D5-A13C2F12D7BC}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{3A3613ED-BB0D-40CF-B0D5-A13C2F12D7BC}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{3A3613ED-BB0D-40CF-B0D5-A13C2F12D7BC}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{3A3613ED-BB0D-40CF-B0D5-A13C2F12D7BC}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{3A3613ED-BB0D-40CF-B0D5-A13C2F12D7BC}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{3A3613ED-BB0D-40CF-B0D5-A13C2F12D7BC}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{3A3613ED-BB0D-40CF-B0D5-A13C2F12D7BC}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{3A3613ED-BB0D-40CF-B0D5-A13C2F12D7BC}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{3A3613ED-BB0D-40CF-B0D5-A13C2F12D7BC}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{3A3613ED-BB0D-40CF-B0D5-A13C2F12D7BC}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{3A3613ED-BB0D-40CF-B0D5-A13C2F12D7BC}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{3A3613ED-BB0D-40CF-B0D5-A13C2F12D7BC}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{3A3613ED-BB0D-40CF-B0D5-A13C2F12D7BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3A3613ED-BB0D-40CF-B0D5-A13C2F12D7BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3A3613ED-BB0D-40CF-B0D5-A13C2F12D7BC}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{3A3613ED-BB0D-40CF-B0D5-A13C2F12D7BC}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{3A3613ED-BB0D-40CF-B0D5-A13C2F12D7BC}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{3A3613ED-BB0D-40CF-B0D5-A13C2F12D7BC}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{3A3613ED-BB0D-40CF-B0D5-A13C2F12D7BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3A3613ED-BB0D-40CF-B0D5-A13C2F12D7BC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3A3613ED-BB0D-40CF-B0D5-A13C2F12D7BC}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{3A3613ED-BB0D-40CF-B0D5-A13C2F12D7BC}.Release|iPhone.Build.0 = Release|Any CPU
-		{3A3613ED-BB0D-40CF-B0D5-A13C2F12D7BC}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{3A3613ED-BB0D-40CF-B0D5-A13C2F12D7BC}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{3A3613ED-BB0D-40CF-B0D5-A13C2F12D7BC}.Sample Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{3A3613ED-BB0D-40CF-B0D5-A13C2F12D7BC}.Sample Release|Any CPU.Build.0 = Debug|Any CPU
-		{3A3613ED-BB0D-40CF-B0D5-A13C2F12D7BC}.Sample Release|iPhone.ActiveCfg = Debug|Any CPU
-		{3A3613ED-BB0D-40CF-B0D5-A13C2F12D7BC}.Sample Release|iPhone.Build.0 = Debug|Any CPU
-		{3A3613ED-BB0D-40CF-B0D5-A13C2F12D7BC}.Sample Release|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{3A3613ED-BB0D-40CF-B0D5-A13C2F12D7BC}.Sample Release|iPhoneSimulator.Build.0 = Debug|Any CPU
 		{41165CA6-DE68-4DF0-A554-CD47B643F545}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
 		{41165CA6-DE68-4DF0-A554-CD47B643F545}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
 		{41165CA6-DE68-4DF0-A554-CD47B643F545}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
diff --git a/src/Sample/SextantSample.Avalonia/App.xaml.cs b/src/Sample/SextantSample.Avalonia/App.xaml.cs
index 7dd79b8c..d255744e 100644
--- a/src/Sample/SextantSample.Avalonia/App.xaml.cs
+++ b/src/Sample/SextantSample.Avalonia/App.xaml.cs
@@ -31,20 +31,19 @@ public class App : Application
     /// </summary>
     public override void OnFrameworkInitializationCompleted()
     {
-        Locator
-            .CurrentMutable
-            .RegisterView<HomeView, HomeViewModel>()
-            .RegisterView<FirstModalView, FirstModalViewModel>()
-            .RegisterView<SecondModalView, SecondModalViewModel>()
-            .RegisterView<RedView, RedViewModel>()
-            .RegisterView<GreenView, GreenViewModel>()
-            .RegisterViewModelFactory(() => new DefaultViewModelFactory())
-            .RegisterNavigationView(() => new NavigationView())
-            .RegisterViewModel(() => new GreenViewModel(Locator.Current.GetService<IViewStackService>()));
+        IViewStackService viewStackService = default!;
 
         Locator
-            .Current
-            .GetService<IViewStackService>()
+                .CurrentMutable
+                .RegisterViewForNavigation<HomeView, HomeViewModel>()
+                .RegisterViewForNavigation<FirstModalView, FirstModalViewModel>(() => new(), () => new(viewStackService))
+                .RegisterViewForNavigation<SecondModalView, SecondModalViewModel>(() => new(), () => new(viewStackService))
+                .RegisterViewForNavigation<RedView, RedViewModel>(() => new(), () => new(viewStackService))
+                .RegisterViewForNavigation<GreenView, GreenViewModel>(() => new(), () => new(viewStackService))
+                .RegisterViewModelFactory(() => new DefaultViewModelFactory())
+                .RegisterNavigationView(() => new NavigationView());
+        viewStackService = Locator.Current.GetService<IViewStackService>()!;
+        viewStackService
             .PushPage(new HomeViewModel());
 
         Interactions.ErrorMessage.RegisterHandler(async context =>
diff --git a/src/Sample/SextantSample.Core/FirstModalNavigationViewModel.cs b/src/Sample/SextantSample.Core/FirstModalNavigationViewModel.cs
index 412be61f..af31f63a 100644
--- a/src/Sample/SextantSample.Core/FirstModalNavigationViewModel.cs
+++ b/src/Sample/SextantSample.Core/FirstModalNavigationViewModel.cs
@@ -10,7 +10,7 @@ namespace SextantSample.ViewModels;
 /// <summary>
 /// FirstModalNavigationViewModel.
 /// </summary>
-/// <seealso cref="SextantSample.ViewModels.ViewModelBase" />
+/// <seealso cref="ViewModelBase" />
 public class FirstModalNavigationViewModel(IViewStackService viewStackService) : ViewModelBase(viewStackService)
 {
     /// <summary>
diff --git a/src/Sample/SextantSample.Core/FirstModalViewModel.cs b/src/Sample/SextantSample.Core/FirstModalViewModel.cs
index 820335c9..a17a3092 100644
--- a/src/Sample/SextantSample.Core/FirstModalViewModel.cs
+++ b/src/Sample/SextantSample.Core/FirstModalViewModel.cs
@@ -14,8 +14,8 @@ namespace SextantSample.ViewModels;
 /// <summary>
 /// FirstModalViewModel.
 /// </summary>
-/// <seealso cref="SextantSample.ViewModels.ViewModelBase" />
-/// <seealso cref="Sextant.IDestructible" />
+/// <seealso cref="ViewModelBase" />
+/// <seealso cref="IDestructible" />
 public class FirstModalViewModel : ViewModelBase, IDestructible
 {
     /// <summary>
@@ -26,10 +26,10 @@ public FirstModalViewModel(IViewStackService viewStackService)
         : base(viewStackService)
     {
         OpenModal = ReactiveCommand
-                    .CreateFromObservable(() => ViewStackService.PushModal(new SecondModalViewModel(viewStackService)), outputScheduler: RxApp.MainThreadScheduler);
+                    .CreateFromObservable(() => ViewStackService!.PushModal(new SecondModalViewModel(viewStackService)), outputScheduler: RxApp.MainThreadScheduler);
 
         PopModal = ReactiveCommand
-                    .CreateFromObservable(() => ViewStackService.PopModal(), outputScheduler: RxApp.MainThreadScheduler);
+                    .CreateFromObservable(() => ViewStackService!.PopModal(), outputScheduler: RxApp.MainThreadScheduler);
 
         OpenModal.Subscribe(_ => Debug.WriteLine("PagePushed"));
         PopModal.Subscribe(_ => Debug.WriteLine("PagePopped"));
diff --git a/src/Sample/SextantSample.Core/GreenViewModel.cs b/src/Sample/SextantSample.Core/GreenViewModel.cs
index 0fe7d975..672d465f 100644
--- a/src/Sample/SextantSample.Core/GreenViewModel.cs
+++ b/src/Sample/SextantSample.Core/GreenViewModel.cs
@@ -15,9 +15,9 @@ namespace SextantSample.ViewModels;
 /// <summary>
 /// GreenViewModel.
 /// </summary>
-/// <seealso cref="SextantSample.ViewModels.ViewModelBase" />
-/// <seealso cref="Sextant.INavigable" />
-/// <seealso cref="Sextant.IDestructible" />
+/// <seealso cref="ViewModelBase" />
+/// <seealso cref="INavigable" />
+/// <seealso cref="IDestructible" />
 public class GreenViewModel : ViewModelBase, INavigable, IDestructible
 {
     /// <summary>
@@ -27,7 +27,7 @@ public class GreenViewModel : ViewModelBase, INavigable, IDestructible
     public GreenViewModel(IViewStackService viewStackService)
         : base(viewStackService) =>
         OpenModal = ReactiveCommand
-            .CreateFromObservable(() => ViewStackService.PushModal(new FirstModalViewModel(viewStackService), string.Empty, false), outputScheduler: RxApp.MainThreadScheduler);
+            .CreateFromObservable(() => ViewStackService!.PushModal(new FirstModalViewModel(viewStackService), string.Empty, false), outputScheduler: RxApp.MainThreadScheduler);
 
     /// <summary>
     /// Gets the identifier.
diff --git a/src/Sample/SextantSample.Core/HomeNavigationViewModel.cs b/src/Sample/SextantSample.Core/HomeNavigationViewModel.cs
index 98c791be..46a70450 100644
--- a/src/Sample/SextantSample.Core/HomeNavigationViewModel.cs
+++ b/src/Sample/SextantSample.Core/HomeNavigationViewModel.cs
@@ -10,5 +10,5 @@ namespace SextantSample.ViewModels;
 /// <summary>
 /// HomeNavigationViewModel.
 /// </summary>
-/// <seealso cref="ReactiveUI.ReactiveObject" />
+/// <seealso cref="ReactiveObject" />
 public class HomeNavigationViewModel : ReactiveObject;
diff --git a/src/Sample/SextantSample.Core/HomeViewModel.cs b/src/Sample/SextantSample.Core/HomeViewModel.cs
index 7860530b..0c21306e 100644
--- a/src/Sample/SextantSample.Core/HomeViewModel.cs
+++ b/src/Sample/SextantSample.Core/HomeViewModel.cs
@@ -14,7 +14,7 @@ namespace SextantSample.ViewModels;
 /// <summary>
 /// HomeViewModel.
 /// </summary>
-/// <seealso cref="SextantSample.ViewModels.ViewModelBase" />
+/// <seealso cref="ViewModelBase" />
 public class HomeViewModel : ViewModelBase
 {
     /// <summary>
@@ -24,13 +24,13 @@ public HomeViewModel()
         : base(Locator.Current.GetService<IViewStackService>())
     {
         OpenModal = ReactiveCommand
-            .CreateFromObservable(() => ViewStackService.PushModal(new FirstModalViewModel(ViewStackService)), outputScheduler: RxApp.MainThreadScheduler);
+            .CreateFromObservable(() => ViewStackService!.PushModal(new FirstModalViewModel(ViewStackService)), outputScheduler: RxApp.MainThreadScheduler);
 
         PushPage = ReactiveCommand
-            .CreateFromObservable(() => ViewStackService.PushPage(new RedViewModel(ViewStackService)), outputScheduler: RxApp.MainThreadScheduler);
+            .CreateFromObservable(() => ViewStackService!.PushPage(new RedViewModel(ViewStackService)), outputScheduler: RxApp.MainThreadScheduler);
 
         PushGenericPage = ReactiveCommand
-            .CreateFromObservable(() => ViewStackService.PushPage<GreenViewModel>(), outputScheduler: RxApp.MainThreadScheduler);
+            .CreateFromObservable(() => ViewStackService!.PushPage<GreenViewModel>(), outputScheduler: RxApp.MainThreadScheduler);
 
         PushPage.ThrownExceptions.Subscribe(error => Interactions.ErrorMessage.Handle(error).Subscribe());
         PushGenericPage.ThrownExceptions.Subscribe(error => Interactions.ErrorMessage.Handle(error).Subscribe());
diff --git a/src/Sample/SextantSample.Core/RedViewModel.cs b/src/Sample/SextantSample.Core/RedViewModel.cs
index a480a91b..10a7afac 100644
--- a/src/Sample/SextantSample.Core/RedViewModel.cs
+++ b/src/Sample/SextantSample.Core/RedViewModel.cs
@@ -14,7 +14,7 @@ namespace SextantSample.ViewModels;
 /// <summary>
 /// RedViewModel.
 /// </summary>
-/// <seealso cref="SextantSample.ViewModels.ViewModelBase" />
+/// <seealso cref="ViewModelBase" />
 public class RedViewModel : ViewModelBase
 {
     /// <summary>
@@ -25,16 +25,16 @@ public RedViewModel(IViewStackService viewStackService)
         : base(viewStackService)
     {
         PopModal = ReactiveCommand
-            .CreateFromObservable(() => ViewStackService.PopModal(), outputScheduler: RxApp.MainThreadScheduler);
+            .CreateFromObservable(() => ViewStackService!.PopModal(), outputScheduler: RxApp.MainThreadScheduler);
 
         PopPage = ReactiveCommand
-            .CreateFromObservable(() => ViewStackService.PopPage(), outputScheduler: RxApp.MainThreadScheduler);
+            .CreateFromObservable(() => ViewStackService!.PopPage(), outputScheduler: RxApp.MainThreadScheduler);
 
         PushPage = ReactiveCommand
-            .CreateFromObservable(() => ViewStackService.PushPage(new RedViewModel(ViewStackService)), outputScheduler: RxApp.MainThreadScheduler);
+            .CreateFromObservable(() => ViewStackService!.PushPage(new RedViewModel(ViewStackService)), outputScheduler: RxApp.MainThreadScheduler);
 
         PopToRoot = ReactiveCommand
-            .CreateFromObservable(() => ViewStackService.PopToRootPage(), outputScheduler: RxApp.MainThreadScheduler);
+            .CreateFromObservable(() => ViewStackService!.PopToRootPage(), outputScheduler: RxApp.MainThreadScheduler);
 
         PopModal.Subscribe(_ => Debug.WriteLine("PagePushed"));
         PopModal.ThrownExceptions.Subscribe(error => Interactions.ErrorMessage.Handle(error).Subscribe());
diff --git a/src/Sample/SextantSample.Core/SecondModalNavigationViewModel.cs b/src/Sample/SextantSample.Core/SecondModalNavigationViewModel.cs
index 08b504bb..415fb53c 100644
--- a/src/Sample/SextantSample.Core/SecondModalNavigationViewModel.cs
+++ b/src/Sample/SextantSample.Core/SecondModalNavigationViewModel.cs
@@ -11,5 +11,5 @@ namespace SextantSample.ViewModels;
 /// <summary>
 /// SecondModalNavigationViewModel.
 /// </summary>
-/// <seealso cref="ReactiveUI.ReactiveObject" />
+/// <seealso cref="ReactiveObject" />
 public class SecondModalNavigationViewModel : ReactiveObject;
diff --git a/src/Sample/SextantSample.Core/SecondModalViewModel.cs b/src/Sample/SextantSample.Core/SecondModalViewModel.cs
index 1382e214..c4394e7c 100644
--- a/src/Sample/SextantSample.Core/SecondModalViewModel.cs
+++ b/src/Sample/SextantSample.Core/SecondModalViewModel.cs
@@ -14,7 +14,7 @@ namespace SextantSample.ViewModels;
 /// <summary>
 /// SecondModalViewModel.
 /// </summary>
-/// <seealso cref="SextantSample.ViewModels.ViewModelBase" />
+/// <seealso cref="ViewModelBase" />
 public class SecondModalViewModel : ViewModelBase
 {
     /// <summary>
@@ -25,10 +25,10 @@ public SecondModalViewModel(IViewStackService viewStackService)
         : base(viewStackService)
     {
         PushPage = ReactiveCommand
-            .CreateFromObservable(() => ViewStackService.PushPage(new RedViewModel(ViewStackService)), outputScheduler: RxApp.MainThreadScheduler);
+            .CreateFromObservable(() => ViewStackService!.PushPage(new RedViewModel(ViewStackService)), outputScheduler: RxApp.MainThreadScheduler);
 
         PopModal = ReactiveCommand
-            .CreateFromObservable(() => ViewStackService.PopModal(), outputScheduler: RxApp.MainThreadScheduler);
+            .CreateFromObservable(() => ViewStackService!.PopModal(), outputScheduler: RxApp.MainThreadScheduler);
 
         PushPage.Subscribe(_ => Debug.WriteLine("PagePushed"));
         PopModal.Subscribe(_ => Debug.WriteLine("PagePopped"));
diff --git a/src/Sample/SextantSample.Core/SextantSample.ViewModels.csproj b/src/Sample/SextantSample.Core/SextantSample.ViewModels.csproj
index a84bf3ef..43cd8254 100644
--- a/src/Sample/SextantSample.Core/SextantSample.ViewModels.csproj
+++ b/src/Sample/SextantSample.Core/SextantSample.ViewModels.csproj
@@ -1,9 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
-    <Platforms>AnyCPU;x64</Platforms>
-    <LangVersion>preview</LangVersion>
+    <TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Sample/SextantSample.Core/ViewModelBase.cs b/src/Sample/SextantSample.Core/ViewModelBase.cs
index dfc10e19..4ddf2f0f 100644
--- a/src/Sample/SextantSample.Core/ViewModelBase.cs
+++ b/src/Sample/SextantSample.Core/ViewModelBase.cs
@@ -12,21 +12,21 @@ namespace SextantSample.ViewModels;
 /// <summary>
 /// ViewModelBase.
 /// </summary>
-/// <seealso cref="ReactiveUI.ReactiveObject" />
-/// <seealso cref="Sextant.IViewModel" />
+/// <seealso cref="ReactiveObject" />
+/// <seealso cref="IViewModel" />
 /// <remarks>
 /// Initializes a new instance of the <see cref="ViewModelBase"/> class.
 /// </remarks>
 /// <param name="viewStackService">The view stack service.</param>
-public abstract class ViewModelBase(IViewStackService viewStackService) : ReactiveObject, IViewModel
+public abstract class ViewModelBase(IViewStackService? viewStackService) : ReactiveObject, IViewModel
 {
     /// <summary>
     /// Gets the ID of the page.
     /// </summary>
-    public virtual string Id { get; }
+    public virtual string? Id { get; }
 
     /// <summary>
     /// Gets the view stack service.
     /// </summary>
-    protected IViewStackService ViewStackService { get; } = viewStackService;
+    protected IViewStackService? ViewStackService { get; } = viewStackService;
 }
diff --git a/src/Sample/SextantSample.Maui/App.xaml b/src/Sample/SextantSample.Maui/App.xaml
deleted file mode 100644
index 28a858fc..00000000
--- a/src/Sample/SextantSample.Maui/App.xaml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Application xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:windows="clr-namespace:Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific;assembly=Microsoft.Maui.Controls"
-             xmlns:local="clr-namespace:SextantSample.Maui"
-             x:Class="SextantSample.Maui.App"
-             windows:Application.ImageDirectory="Assets">
-    <Application.Resources>
-        <ResourceDictionary>
-        </ResourceDictionary>
-    </Application.Resources>
-</Application>
diff --git a/src/Sample/SextantSample.Maui/App.xaml.cs b/src/Sample/SextantSample.Maui/App.xaml.cs
deleted file mode 100644
index 697e0957..00000000
--- a/src/Sample/SextantSample.Maui/App.xaml.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-[assembly: XamlCompilation(XamlCompilationOptions.Compile)]
-
-namespace SextantSample.Maui;
-
-public partial class App : Application
-{
-    public App()
-    {
-        InitializeComponent();
-
-        Locator
-            .Current
-            .GetService<IViewStackService>()
-            .PushPage(new HomeViewModel(), null, true, false)
-            .Subscribe();
-
-        MainPage = Locator.Current.GetNavigationView();
-    }
-}
diff --git a/src/Sample/SextantSample.Maui/MauiProgram.cs b/src/Sample/SextantSample.Maui/MauiProgram.cs
deleted file mode 100644
index 526b10f2..00000000
--- a/src/Sample/SextantSample.Maui/MauiProgram.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using static Sextant.Sextant;
-
-namespace SextantSample.Maui;
-
-public static class MauiProgram
-{
-    public static MauiApp CreateMauiApp()
-    {
-        MauiAppBuilder builder = MauiApp.CreateBuilder();
-        builder
-            .UseMauiApp<App>()
-            .ConfigureFonts(fonts =>
-            {
-                fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
-                fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
-            });
-
-        RxApp.DefaultExceptionHandler = new SextantDefaultExceptionHandler();
-        IMutableDependencyResolver resolver = Locator.CurrentMutable;
-        resolver.InitializeSplat();
-        resolver.InitializeReactiveUI();
-        Instance.InitializeMaui();
-        Locator
-            .CurrentMutable
-            .RegisterView<HomeView, HomeViewModel>()
-            .RegisterView<FirstModalView, FirstModalViewModel>()
-            .RegisterView<SecondModalView, SecondModalViewModel>()
-            .RegisterView<RedView, RedViewModel>()
-            .RegisterView<GreenView, GreenViewModel>()
-            .RegisterNavigationView(() => new BlueNavigationView())
-            .RegisterViewModel(() => new GreenViewModel(Locator.Current.GetService<IViewStackService>()));
-
-#if DEBUG
-        builder.Logging.AddDebug();
-#endif
-
-        return builder.Build();
-    }
-}
diff --git a/src/Sample/SextantSample.Maui/Platforms/Android/MainActivity.cs b/src/Sample/SextantSample.Maui/Platforms/Android/MainActivity.cs
deleted file mode 100644
index 0e4f3ac4..00000000
--- a/src/Sample/SextantSample.Maui/Platforms/Android/MainActivity.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using Android.App;
-using Android.Content.PM;
-using Android.OS;
-
-namespace SextantSample.Maui;
-
-/// <summary>
-/// MainActivity.
-/// </summary>
-/// <seealso cref="MauiAppCompatActivity" />
-[Activity(Theme = "@style/Maui.SplashTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize)]
-public class MainActivity : MauiAppCompatActivity
-{
-    /// <summary>
-    /// Called when [create].
-    /// </summary>
-    /// <param name="savedInstanceState">State of the saved instance.</param>
-    protected override void OnCreate(Bundle savedInstanceState)
-    {
-        base.OnCreate(savedInstanceState);
-        Platform.Init(this, savedInstanceState);
-    }
-
-    /// <summary>
-    /// Called when [request permissions result].
-    /// </summary>
-    /// <param name="requestCode">The request code.</param>
-    /// <param name="permissions">The permissions.</param>
-    /// <param name="grantResults">The grant results.</param>
-    public override void OnRequestPermissionsResult(int requestCode, string[] permissions, Permission[] grantResults)
-    {
-        Platform.OnRequestPermissionsResult(requestCode, permissions, grantResults);
-
-        base.OnRequestPermissionsResult(requestCode, permissions, grantResults);
-    }
-}
diff --git a/src/Sample/SextantSample.Maui/Platforms/Android/MainApplication.cs b/src/Sample/SextantSample.Maui/Platforms/Android/MainApplication.cs
deleted file mode 100644
index bcd7e187..00000000
--- a/src/Sample/SextantSample.Maui/Platforms/Android/MainApplication.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Android.App;
-using Android.Runtime;
-
-namespace SextantSample.Maui;
-
-[Application]
-public class MainApplication : MauiApplication
-{
-    public MainApplication(IntPtr handle, JniHandleOwnership ownership)
-        : base(handle, ownership)
-    {
-    }
-
-    protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
-}
\ No newline at end of file
diff --git a/src/Sample/SextantSample.Maui/Platforms/MacCatalyst/AppDelegate.cs b/src/Sample/SextantSample.Maui/Platforms/MacCatalyst/AppDelegate.cs
deleted file mode 100644
index 7a2de645..00000000
--- a/src/Sample/SextantSample.Maui/Platforms/MacCatalyst/AppDelegate.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Foundation;
-
-namespace SextantSample.Maui;
-
-[Register("AppDelegate")]
-public class AppDelegate : MauiUIApplicationDelegate
-{
-    protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
-}
diff --git a/src/Sample/SextantSample.Maui/Platforms/MacCatalyst/Program.cs b/src/Sample/SextantSample.Maui/Platforms/MacCatalyst/Program.cs
deleted file mode 100644
index 8b3d71fe..00000000
--- a/src/Sample/SextantSample.Maui/Platforms/MacCatalyst/Program.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using UIKit;
-
-namespace SextantSample.Maui;
-
-public class Program
-{
-    // This is the main entry point of the application.
-    static void Main(string[] args)
-    {
-        // if you want to use a different Application Delegate class from "AppDelegate"
-        // you can specify it here.
-        UIApplication.Main(args, null, typeof(AppDelegate));
-    }
-}
\ No newline at end of file
diff --git a/src/Sample/SextantSample.Maui/Platforms/Windows/App.xaml.cs b/src/Sample/SextantSample.Maui/Platforms/Windows/App.xaml.cs
deleted file mode 100644
index 63988fc3..00000000
--- a/src/Sample/SextantSample.Maui/Platforms/Windows/App.xaml.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// To learn more about WinUI, the WinUI project structure,
-// and more about our project templates, see: http://aka.ms/winui-project-info.
-
-namespace SextantSample.Maui.WinUI;
-
-/// <summary>
-/// Provides application-specific behavior to supplement the default Application class.
-/// </summary>
-public partial class App : MauiWinUIApplication
-{
-    /// <summary>
-    /// Initializes the singleton application object.  This is the first line of authored code
-    /// executed, and as such is the logical equivalent of main() or WinMain().
-    /// </summary>
-    public App()
-    {
-        InitializeComponent();
-    }
-
-    protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
-}
diff --git a/src/Sample/SextantSample.Maui/Platforms/iOS/AppDelegate.cs b/src/Sample/SextantSample.Maui/Platforms/iOS/AppDelegate.cs
deleted file mode 100644
index 7a2de645..00000000
--- a/src/Sample/SextantSample.Maui/Platforms/iOS/AppDelegate.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Foundation;
-
-namespace SextantSample.Maui;
-
-[Register("AppDelegate")]
-public class AppDelegate : MauiUIApplicationDelegate
-{
-    protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
-}
diff --git a/src/Sample/SextantSample.Maui/Platforms/iOS/Program.cs b/src/Sample/SextantSample.Maui/Platforms/iOS/Program.cs
deleted file mode 100644
index 8b3d71fe..00000000
--- a/src/Sample/SextantSample.Maui/Platforms/iOS/Program.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using UIKit;
-
-namespace SextantSample.Maui;
-
-public class Program
-{
-    // This is the main entry point of the application.
-    static void Main(string[] args)
-    {
-        // if you want to use a different Application Delegate class from "AppDelegate"
-        // you can specify it here.
-        UIApplication.Main(args, null, typeof(AppDelegate));
-    }
-}
\ No newline at end of file
diff --git a/src/Sample/SextantSample.Maui/Platforms/iOS/Resources/LaunchScreen.xib b/src/Sample/SextantSample.Maui/Platforms/iOS/Resources/LaunchScreen.xib
deleted file mode 100644
index 3e5075f7..00000000
--- a/src/Sample/SextantSample.Maui/Platforms/iOS/Resources/LaunchScreen.xib
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6214" systemVersion="14A314h" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6207" />
-        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1" />
-    </dependencies>
-    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" />
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder" />
-        <view contentMode="scaleToFill" id="iN0-l3-epB">
-            <rect key="frame" x="0.0" y="0.0" width="480" height="480" />
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" />
-            <subviews>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright (c) 2017 " textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines"
-                    minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
-                    <rect key="frame" x="20" y="439" width="441" height="21" />
-                    <fontDescription key="fontDescription" type="system" pointSize="17" />
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor" />
-                    <nil key="highlightedColor" />
-                </label>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Sample.iOS" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines"
-                    minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
-                    <rect key="frame" x="20" y="140" width="441" height="43" />
-                    <fontDescription key="fontDescription" type="boldSystem" pointSize="36" />
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor" />
-                    <nil key="highlightedColor" />
-                </label>
-            </subviews>
-            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite" />
-            <constraints>
-                <constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC" />
-                <constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk" />
-                <constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Kzo-t9-V3l" />
-                <constraint firstItem="8ie-xW-0ye" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="MfP-vx-nX0" />
-                <constraint firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="ZEH-qu-HZ9" />
-                <constraint firstItem="kId-c2-rCX" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="fvb-Df-36g" />
-            </constraints>
-            <nil key="simulatedStatusBarMetrics" />
-            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics" />
-            <point key="canvasLocation" x="548" y="455" />
-        </view>
-    </objects>
-</document>
diff --git a/src/Sample/SextantSample.Maui/Resources/Fonts/OpenSans-Regular.ttf b/src/Sample/SextantSample.Maui/Resources/Fonts/OpenSans-Regular.ttf
deleted file mode 100644
index 1beddae5..00000000
--- a/src/Sample/SextantSample.Maui/Resources/Fonts/OpenSans-Regular.ttf
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:037236ed4bf58a85f67074c165d308260fd6be01c86d7df4e79ea16eb273f8c5
-size 96932
diff --git a/src/Sample/SextantSample.Maui/Resources/Fonts/OpenSans-Semibold.ttf b/src/Sample/SextantSample.Maui/Resources/Fonts/OpenSans-Semibold.ttf
deleted file mode 100644
index d81c625f..00000000
--- a/src/Sample/SextantSample.Maui/Resources/Fonts/OpenSans-Semibold.ttf
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5e8d9e1a89083cd1b0849993fe2f3acc9aa33b7f439f7e8616872f6897f30684
-size 100820
diff --git a/src/Sample/SextantSample.Maui/Resources/Images/dotnet_bot.svg b/src/Sample/SextantSample.Maui/Resources/Images/dotnet_bot.svg
deleted file mode 100644
index abfaff26..00000000
--- a/src/Sample/SextantSample.Maui/Resources/Images/dotnet_bot.svg
+++ /dev/null
@@ -1,93 +0,0 @@
-<svg width="419" height="519" viewBox="0 0 419 519" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M284.432 247.568L284.004 221.881C316.359 221.335 340.356 211.735 355.308 193.336C382.408 159.996 372.893 108.183 372.786 107.659L398.013 102.831C398.505 105.432 409.797 167.017 375.237 209.53C355.276 234.093 324.719 246.894 284.432 247.568Z" fill="#8A6FE8"/>
-<path d="M331.954 109.36L361.826 134.245C367.145 138.676 375.055 137.959 379.497 132.639C383.928 127.32 383.211 119.41 377.891 114.969L348.019 90.0842C342.7 85.6531 334.79 86.3702 330.348 91.6896C325.917 97.0197 326.634 104.929 331.954 109.36Z" fill="#8A6FE8"/>
-<path d="M407.175 118.062L417.92 94.2263C420.735 87.858 417.856 80.4087 411.488 77.5831C405.12 74.7682 397.67 77.6473 394.845 84.0156L383.831 108.461L407.175 118.062Z" fill="#8A6FE8"/>
-<path d="M401.363 105.175L401.234 69.117C401.181 62.1493 395.498 56.541 388.53 56.5945C381.562 56.648 375.954 62.3313 376.007 69.2989L376.018 96.11L401.363 105.175Z" fill="#8A6FE8"/>
-<path d="M386.453 109.071L378.137 73.9548C376.543 67.169 369.757 62.9628 362.971 64.5575C356.185 66.1523 351.979 72.938 353.574 79.7237L362.04 115.482L386.453 109.071Z" fill="#8A6FE8"/>
-<path d="M381.776 142.261C396.359 142.261 408.181 130.44 408.181 115.857C408.181 101.274 396.359 89.4527 381.776 89.4527C367.194 89.4527 355.372 101.274 355.372 115.857C355.372 130.44 367.194 142.261 381.776 142.261Z" fill="url(#paint0_radial)"/>
-<path d="M248.267 406.979C248.513 384.727 245.345 339.561 222.376 301.736L199.922 315.372C220.76 349.675 222.323 389.715 221.841 407.182C221.798 408.627 235.263 409.933 248.267 406.979Z" fill="url(#paint1_linear)"/>
-<path d="M221.841 406.936L242.637 406.84L262.052 518.065L220.311 518.258C217.132 518.269 214.724 515.711 214.938 512.532L221.841 406.936Z" fill="#522CD5"/>
-<path d="M306.566 488.814C310.173 491.661 310.109 495.782 309.831 500.127L308.964 513.452C308.803 515.839 306.727 517.798 304.34 517.809L260.832 518.012C258.125 518.023 256.08 515.839 256.262 513.142L256.551 499.335C256.883 494.315 255.192 492.474 251.307 487.744C244.649 479.663 224.967 435.62 226.84 406.925L248.256 406.829C249.691 423.858 272.167 461.682 306.566 488.814Z" fill="url(#paint2_linear)"/>
-<path d="M309.82 500.127C310.023 497.088 310.077 494.176 308.889 491.715L254.635 491.961C256.134 494.166 256.765 496.092 256.562 499.314L256.273 513.121C256.091 515.828 258.146 518.012 260.843 517.99L304.34 517.798C306.727 517.787 308.803 515.828 308.964 513.442L309.82 500.127Z" fill="url(#paint3_radial)"/>
-<path d="M133.552 407.471C133.103 385.22 135.864 340.021 158.49 301.993L181.073 315.425C160.545 349.921 159.346 389.972 159.989 407.428C160.042 408.884 146.578 410.318 133.552 407.471Z" fill="url(#paint4_linear)"/>
-<path d="M110.798 497.152C110.765 494.187 111.204 491.575 112.457 487.23C131.882 434.132 133.52 407.364 133.52 407.364L159.999 407.246C159.999 407.246 161.819 433.512 181.716 486.427C183.289 490.195 183.471 493.641 183.674 496.831L183.792 513.816C183.803 516.374 181.716 518.483 179.158 518.494L177.873 518.504L116.781 518.782L115.496 518.793C112.927 518.804 110.83 516.728 110.819 514.159L110.798 497.152Z" fill="url(#paint5_linear)"/>
-<path d="M110.798 497.152C110.798 496.67 110.808 496.199 110.83 495.739C110.969 494.262 111.643 492.603 114.875 492.582L180.207 492.282C182.561 492.367 183.343 494.176 183.589 495.311C183.621 495.814 183.664 496.328 183.696 496.82L183.813 513.806C183.824 515.411 183.011 516.824 181.769 517.669C181.031 518.172 180.132 518.472 179.179 518.483L177.895 518.494L116.802 518.772L115.528 518.782C114.244 518.793 113.077 518.269 112.232 517.434C111.386 516.599 110.862 515.432 110.851 514.148L110.798 497.152Z" fill="url(#paint6_radial)"/>
-<path d="M314.979 246.348C324.162 210.407 318.008 181.777 318.008 181.777L326.452 181.734L326.656 181.574C314.262 115.75 256.326 66.0987 186.949 66.4198C108.796 66.773 45.7233 130.424 46.0765 208.577C46.4297 286.731 110.08 349.803 188.234 349.45C249.905 349.172 302.178 309.474 321.304 254.343C321.872 251.999 321.797 247.804 314.979 246.348Z" fill="url(#paint7_radial)"/>
-<path d="M310.237 279.035L65.877 280.148C71.3998 289.428 77.95 298.012 85.3672 305.761L290.972 304.829C298.336 297.005 304.8 288.368 310.237 279.035Z" fill="#D8CFF7"/>
-<path d="M235.062 312.794L280.924 312.585L280.74 272.021L234.877 272.23L235.062 312.794Z" fill="#512BD4"/>
-<path d="M243.001 297.626C242.691 297.626 242.434 297.53 242.22 297.327C242.006 297.123 241.899 296.866 241.899 296.588C241.899 296.299 242.006 296.042 242.22 295.839C242.434 295.625 242.691 295.528 243.001 295.528C243.312 295.528 243.568 295.635 243.782 295.839C243.996 296.042 244.114 296.299 244.114 296.588C244.114 296.877 244.007 297.123 243.793 297.327C243.568 297.519 243.312 297.626 243.001 297.626Z" fill="white"/>
-<path d="M255.192 297.434H253.212L247.967 289.203C247.839 289 247.721 288.775 247.636 288.55H247.593C247.636 288.786 247.657 289.299 247.657 290.091L247.668 297.444H245.912L245.891 286.228H247.999L253.062 294.265C253.276 294.597 253.415 294.833 253.479 294.95H253.511C253.458 294.651 253.437 294.148 253.437 293.441L253.426 286.217H255.17L255.192 297.434Z" fill="white"/>
-<path d="M263.733 297.412L257.589 297.423L257.568 286.206L263.465 286.195V287.779L259.387 287.79L259.398 290.969L263.155 290.958V292.532L259.398 292.542L259.409 295.86L263.733 295.85V297.412Z" fill="white"/>
-<path d="M272.445 287.758L269.298 287.769L269.32 297.401H267.5L267.479 287.769L264.343 287.779V286.195L272.434 286.174L272.445 287.758Z" fill="white"/>
-<path d="M315.279 246.337C324.355 210.836 318.457 182.483 318.308 181.798L171.484 182.462C171.484 182.462 162.226 181.563 162.268 190.018C162.311 198.463 162.761 222.341 162.878 248.746C162.9 254.172 167.363 256.773 170.863 256.751C170.874 256.751 311.618 252.213 315.279 246.337Z" fill="url(#paint8_radial)"/>
-<path d="M227.685 246.798C227.685 246.798 250.183 228.827 254.571 225.499C258.959 222.17 262.812 221.977 266.869 225.445C270.925 228.913 293.616 246.498 293.616 246.498L227.685 246.798Z" fill="#A08BE8"/>
-<path d="M320.748 256.141C320.748 256.141 324.943 248.414 315.279 246.348C315.289 246.305 170.927 246.894 170.927 246.894C167.566 246.905 163.232 244.925 162.846 241.671C162.857 244.004 162.878 246.369 162.889 248.756C162.91 253.68 166.582 256.27 169.878 256.698C170.21 256.73 170.542 256.773 170.874 256.773L180.742 256.73L320.748 256.141Z" fill="#512BD4"/>
-<path d="M206.4 233.214C212.511 233.095 217.302 224.667 217.102 214.39C216.901 204.112 211.785 195.878 205.674 195.997C199.563 196.116 194.772 204.544 194.973 214.821C195.173 225.099 200.289 233.333 206.4 233.214Z" fill="#512BD4"/>
-<path d="M306.249 214.267C306.356 203.989 301.488 195.605 295.377 195.541C289.266 195.478 284.225 203.758 284.118 214.037C284.011 224.315 288.878 232.699 294.99 232.763C301.101 232.826 306.142 224.545 306.249 214.267Z" fill="#512BD4"/>
-<path d="M205.905 205.291C208.152 203.022 211.192 202.016 214.157 202.262C215.912 205.495 217.014 209.733 217.111 214.389C217.164 217.3 216.811 220.04 216.158 222.513C212.669 223.519 208.752 222.662 205.979 219.922C201.912 215.909 201.88 209.348 205.905 205.291Z" fill="#8065E0"/>
-<path d="M294.996 204.285C297.255 202.016 300.294 200.999 303.259 201.256C305.164 204.628 306.309 209.209 306.256 214.239C306.224 216.808 305.892 219.259 305.303 221.485C301.793 222.523 297.843 221.678 295.061 218.916C291.004 214.892 290.972 208.342 294.996 204.285Z" fill="#8065E0"/>
-<path d="M11.6342 357.017C10.9171 354.716 -5.72611 300.141 21.3204 258.903C36.9468 235.078 63.3083 221.035 99.6664 217.15L102.449 243.276C74.3431 246.273 54.4676 256.345 43.3579 273.202C23.0971 303.941 36.5722 348.733 36.7113 349.183L11.6342 357.017Z" fill="url(#paint9_linear)"/>
-<path d="M95.1498 252.802C109.502 252.802 121.137 241.167 121.137 226.815C121.137 212.463 109.502 200.828 95.1498 200.828C80.7976 200.828 69.1628 212.463 69.1628 226.815C69.1628 241.167 80.7976 252.802 95.1498 252.802Z" fill="url(#paint10_radial)"/>
-<path d="M72.0098 334.434L33.4683 329.307C26.597 328.397 20.2929 333.214 19.3725 340.085C18.4627 346.956 23.279 353.26 30.1504 354.181L68.6919 359.308C75.5632 360.217 81.8673 355.401 82.7878 348.53C83.6975 341.658 78.8705 335.344 72.0098 334.434Z" fill="#8A6FE8"/>
-<path d="M3.73535 367.185L7.35297 393.076C8.36975 399.968 14.7702 404.731 21.6629 403.725C28.5556 402.708 33.3185 396.308 32.3124 389.415L28.5984 362.861L3.73535 367.185Z" fill="#8A6FE8"/>
-<path d="M15.5194 374.988L34.849 405.427C38.6058 411.292 46.4082 413.005 52.2735 409.248C58.1387 405.491 59.8512 397.689 56.0945 391.823L41.7953 369.144L15.5194 374.988Z" fill="#8A6FE8"/>
-<path d="M26.0511 363.739L51.8026 389.019C56.7688 393.911 64.7532 393.846 69.6445 388.88C74.5358 383.914 74.4715 375.929 69.516 371.038L43.2937 345.297L26.0511 363.739Z" fill="#8A6FE8"/>
-<path d="M26.4043 381.912C40.987 381.912 52.8086 370.091 52.8086 355.508C52.8086 340.925 40.987 329.104 26.4043 329.104C11.8216 329.104 0 340.925 0 355.508C0 370.091 11.8216 381.912 26.4043 381.912Z" fill="url(#paint11_radial)"/>
-<path d="M184.73 63.6308L157.819 66.5892L158.561 38.5412L177.888 36.4178L184.73 63.6308Z" fill="#8A6FE8"/>
-<path d="M170.018 41.647C180.455 39.521 187.193 29.3363 185.067 18.8988C182.941 8.46126 172.757 1.72345 162.319 3.84944C151.882 5.97543 145.144 16.1601 147.27 26.5976C149.396 37.0351 159.58 43.773 170.018 41.647Z" fill="#D8CFF7"/>
-<path d="M196.885 79.385C198.102 79.2464 198.948 78.091 198.684 76.8997C195.851 64.2818 183.923 55.5375 170.773 56.9926C157.622 58.4371 147.886 69.5735 147.865 82.4995C147.863 83.7232 148.949 84.6597 150.168 84.5316L196.885 79.385Z" fill="url(#paint12_radial)"/>
-<defs>
-<radialGradient id="paint0_radial" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(382.004 103.457) scale(26.4058)">
-<stop stop-color="#8065E0"/>
-<stop offset="1" stop-color="#512BD4"/>
-</radialGradient>
-<linearGradient id="paint1_linear" x1="214.439" y1="303.482" x2="236.702" y2="409.505" gradientUnits="userSpaceOnUse">
-<stop stop-color="#522CD5"/>
-<stop offset="0.4397" stop-color="#8A6FE8"/>
-</linearGradient>
-<linearGradient id="paint2_linear" x1="231.673" y1="404.144" x2="297.805" y2="522.048" gradientUnits="userSpaceOnUse">
-<stop stop-color="#522CD5"/>
-<stop offset="0.4397" stop-color="#8A6FE8"/>
-</linearGradient>
-<radialGradient id="paint3_radial" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(280.957 469.555) rotate(-0.260742) scale(45.8326)">
-<stop offset="0.034" stop-color="#522CD5"/>
-<stop offset="0.9955" stop-color="#8A6FE8"/>
-</radialGradient>
-<linearGradient id="paint4_linear" x1="166.061" y1="303.491" x2="144.763" y2="409.709" gradientUnits="userSpaceOnUse">
-<stop stop-color="#522CD5"/>
-<stop offset="0.4397" stop-color="#8A6FE8"/>
-</linearGradient>
-<linearGradient id="paint5_linear" x1="146.739" y1="407.302" x2="147.246" y2="518.627" gradientUnits="userSpaceOnUse">
-<stop stop-color="#522CD5"/>
-<stop offset="0.4397" stop-color="#8A6FE8"/>
-</linearGradient>
-<radialGradient id="paint6_radial" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(148.63 470.023) rotate(179.739) scale(50.2476)">
-<stop offset="0.034" stop-color="#522CD5"/>
-<stop offset="0.9955" stop-color="#8A6FE8"/>
-</radialGradient>
-<radialGradient id="paint7_radial" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(219.219 153.929) rotate(179.739) scale(140.935)">
-<stop offset="0.4744" stop-color="#A08BE8"/>
-<stop offset="0.8618" stop-color="#8065E0"/>
-</radialGradient>
-<radialGradient id="paint8_radial" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(314.861 158.738) rotate(179.739) scale(146.053)">
-<stop offset="0.0933" stop-color="#E1DFDD"/>
-<stop offset="0.6573" stop-color="white"/>
-</radialGradient>
-<linearGradient id="paint9_linear" x1="54.1846" y1="217.159" x2="54.1846" y2="357.022" gradientUnits="userSpaceOnUse">
-<stop offset="0.3344" stop-color="#9780E6"/>
-<stop offset="0.8488" stop-color="#8A6FE8"/>
-</linearGradient>
-<radialGradient id="paint10_radial" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(90.3494 218.071) rotate(-0.260742) scale(25.9924)">
-<stop stop-color="#8065E0"/>
-<stop offset="1" stop-color="#512BD4"/>
-</radialGradient>
-<radialGradient id="paint11_radial" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(25.805 345.043) scale(26.4106)">
-<stop stop-color="#8065E0"/>
-<stop offset="1" stop-color="#512BD4"/>
-</radialGradient>
-<radialGradient id="paint12_radial" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(169.113 67.3662) rotate(-32.2025) scale(21.0773)">
-<stop stop-color="#8065E0"/>
-<stop offset="1" stop-color="#512BD4"/>
-</radialGradient>
-</defs>
-</svg>
diff --git a/src/Sample/SextantSample.Maui/SextantSample.Maui.csproj b/src/Sample/SextantSample.Maui/SextantSample.Maui.csproj
deleted file mode 100644
index 193f0eae..00000000
--- a/src/Sample/SextantSample.Maui/SextantSample.Maui.csproj
+++ /dev/null
@@ -1,88 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFrameworks>net8.0-ios;net8.0-android;net8.0-maccatalyst</TargetFrameworks>
-    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) and '$(MSBuildRuntimeType)' == 'Full'">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>SextantSample.Maui</RootNamespace>
-    <UseMaui>true</UseMaui>
-    <SingleProject>true</SingleProject>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
-    <!-- Display name -->
-    <ApplicationTitle>SextantSample.Maui</ApplicationTitle>
-    <!-- App Identifier -->
-    <ApplicationId>com.companyname.SextantSample.Maui</ApplicationId>
-    <ApplicationId Condition="$(TargetFramework.Contains('-windows'))">919dc1f9-17a9-48b3-81f8-0b8016bdfbf7</ApplicationId>
-    <!-- Versions -->
-    <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
-    <ApplicationVersion>1</ApplicationVersion>
-    <!-- Required for C# Hot Reload -->
-    <UseInterpreter Condition="'$(Configuration)' == 'Debug'">True</UseInterpreter>
-    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
-    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">14.0</SupportedOSPlatformVersion>
-    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
-    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
-    <TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- App Icon -->
-    <!-- Splash Screen -->
-    <!-- Images -->
-    <MauiImage Include="Resources\Images\*" />
-    <!-- Custom Fonts -->
-    <MauiFont Include="Resources\Fonts\*" />
-    <!-- Raw Assets (also remove the "Resources\Raw" prefix) -->
-    <MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
-  </ItemGroup>
-  <ItemGroup>
-    <MauiAsset Remove="Resources\Raw\AboutAssets.txt" />
-    <MauiFont Remove="Resources\Fonts\OpenSans-Regular.ttf" />
-    <MauiFont Remove="Resources\Fonts\OpenSans-Semibold.ttf" />
-    <MauiImage Remove="Resources\Images\dotnet_bot.svg" />
-    <None Remove="Platforms\Android\AndroidManifest.xml" />
-    <None Remove="Resources\AppIcon\appicon.svg" />
-    <None Remove="Resources\AppIcon\appiconfg.svg" />
-    <None Remove="Resources\Fonts\OpenSans-Semibold.ttf" />
-    <None Remove="Resources\Images\dotnet_bot.svg" />
-    <None Remove="Resources\Raw\AboutAssets.txt" />
-    <None Remove="Resources\Splash\splash.svg" />
-  </ItemGroup>
-  <ItemGroup>
-    <BundleResource Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
-    <BundleResource Include="Resources\AppIcon\appiconfg.svg" />
-    <BundleResource Include="Resources\Fonts\OpenSans-Regular.ttf" />
-    <BundleResource Include="Resources\Fonts\OpenSans-Semibold.ttf" />
-    <BundleResource Include="Resources\Images\dotnet_bot.svg" BaseSize="168,208" />
-    <BundleResource Include="Resources\Raw\AboutAssets.txt" />
-    <BundleResource Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Platforms\Android\AndroidManifest.xml" />
-  </ItemGroup>
-  <ItemGroup Condition="$(TargetFramework.StartsWith('net8'))">
-    <PackageReference Include="Microsoft.Maui.Controls" />
-    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Update="Views\**\*.xaml.cs">
-      <DependentUpon>%(Filename)</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <MauiXaml Update="Views\**\*.xaml">
-      <SubType>Designer</SubType>
-    </MauiXaml>
-  </ItemGroup>
-  <PropertyGroup Condition="$(TargetFramework.Contains('-windows'))">
-    <OutputType>WinExe</OutputType>
-    <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
-    <WindowsPackageType>MSIX</WindowsPackageType>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Sextant.Maui\Sextant.Maui.csproj" />
-    <ProjectReference Include="..\SextantSample.Core\SextantSample.ViewModels.csproj" />
-  </ItemGroup>
-</Project>
diff --git a/src/Sample/SextantSample.UWP/App.xaml b/src/Sample/SextantSample.UWP/App.xaml
deleted file mode 100644
index 871674c0..00000000
--- a/src/Sample/SextantSample.UWP/App.xaml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Application
-    x:Class="SextantSample.UWP.App"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:SextantSample.UWP">
-
-</Application>
diff --git a/src/Sample/SextantSample.UWP/App.xaml.cs b/src/Sample/SextantSample.UWP/App.xaml.cs
deleted file mode 100644
index 7d276f34..00000000
--- a/src/Sample/SextantSample.UWP/App.xaml.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using ReactiveUI;
-using Sextant;
-using SextantSample.UWP.Views;
-using SextantSample.ViewModels;
-using Splat;
-using Windows.ApplicationModel;
-using Windows.ApplicationModel.Activation;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Navigation;
-using static Sextant.Sextant;
-
-namespace SextantSample.UWP
-{
-    /// <summary>
-    /// Provides application-specific behavior to supplement the default Application class.
-    /// </summary>
-    sealed partial class App : Application
-    {
-        /// <summary>
-        /// Initializes the singleton application object.  This is the first line of authored code
-        /// executed, and as such is the logical equivalent of main() or WinMain().
-        /// </summary>
-        public App()
-        {
-            this.InitializeComponent();
-            this.Suspending += OnSuspending;
-
-            RxApp.DefaultExceptionHandler = new SextantDefaultExceptionHandler();
-        }
-
-        /// <summary>
-        /// Invoked when the application is launched normally by the end user.  Other entry points
-        /// will be used such as when the application is launched to open a specific file.
-        /// </summary>
-        /// <param name="e">Details about the launch request and process.</param>
-        protected override void OnLaunched(LaunchActivatedEventArgs e)
-        {
-            Frame rootFrame = Window.Current.Content as Frame;
-
-            Instance.Initialize();
-
-            Locator
-                .CurrentMutable
-                .RegisterViewUWP<HomeView, HomeViewModel>()
-                .RegisterViewUWP<FirstModalView, FirstModalViewModel>()
-                .RegisterViewUWP<SecondModalView, SecondModalViewModel>()
-                .RegisterViewUWP<RedView, RedViewModel>()
-                .RegisterViewUWP<GreenView, GreenViewModel>()
-                .RegisterNavigationView(() => new BlueNavigationView())
-                .RegisterViewModel(() => new GreenViewModel(Locator.Current.GetService<IViewStackService>()));
-
-            Window.Current.Content = Splat.Locator.Current.GetNavigationView();
-
-            //// Do not repeat app initialization when the Window already has content,
-            //// just ensure that the window is active
-            //if (rootFrame is null)
-            //{
-            //    // Create a Frame to act as the navigation context and navigate to the first page
-            //    rootFrame = new Frame();
-
-            //    rootFrame.NavigationFailed += OnNavigationFailed;
-
-            //    if (e.PreviousExecutionState == ApplicationExecutionState.Terminated)
-            //    {
-            //        //TODO: Load state from previously suspended application
-            //    }
-
-            //    // Place the frame in the current Window
-            //    Window.Current.Content = rootFrame;
-            //}
-
-            if (e.PrelaunchActivated == false)
-            {
-                //if (rootFrame.Content is null)
-                //{
-                //    // When the navigation stack isn't restored navigate to the first page,
-                //    // configuring the new page by passing required information as a navigation
-                //    // parameter
-                //    //rootFrame.Navigate(typeof(MainPage), e.Arguments);
-                    
-
-                    
-                //}
-
-                Locator
-                       .Current
-                       .GetService<IViewStackService>()
-                       .PushPage(new HomeViewModel(), null, true, false)
-                       .Subscribe();
-                // Ensure the current window is active
-                Window.Current.Activate();
-            }
-        }
-
-        /// <summary>
-        /// Invoked when Navigation to a certain page fails
-        /// </summary>
-        /// <param name="sender">The Frame which failed navigation</param>
-        /// <param name="e">Details about the navigation failure</param>
-        void OnNavigationFailed(object sender, NavigationFailedEventArgs e) => throw new Exception("Failed to load Page " + e.SourcePageType.FullName);
-
-        /// <summary>
-        /// Invoked when application execution is being suspended.  Application state is saved
-        /// without knowing whether the application will be terminated or resumed with the contents
-        /// of memory still intact.
-        /// </summary>
-        /// <param name="sender">The source of the suspend request.</param>
-        /// <param name="e">Details about the suspend request.</param>
-        private void OnSuspending(object sender, SuspendingEventArgs e)
-        {
-            var deferral = e.SuspendingOperation.GetDeferral();
-            //TODO: Save application state and stop any background activity
-            deferral.Complete();
-        }
-    }
-}
diff --git a/src/Sample/SextantSample.UWP/Assets/LockScreenLogo.scale-200.png b/src/Sample/SextantSample.UWP/Assets/LockScreenLogo.scale-200.png
deleted file mode 100644
index 8cf1cc02..00000000
--- a/src/Sample/SextantSample.UWP/Assets/LockScreenLogo.scale-200.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a41a053b3fc3b0c109720ccd437a19725ae9163ea75990222a12b596b9c7ca76
-size 1430
diff --git a/src/Sample/SextantSample.UWP/Assets/SplashScreen.scale-200.png b/src/Sample/SextantSample.UWP/Assets/SplashScreen.scale-200.png
deleted file mode 100644
index 1ade290f..00000000
--- a/src/Sample/SextantSample.UWP/Assets/SplashScreen.scale-200.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a3382b0b1b834e95b888f06d483dc2d78fa1b3855e0683d5cfbd5167be9731a6
-size 7700
diff --git a/src/Sample/SextantSample.UWP/Assets/Square150x150Logo.scale-200.png b/src/Sample/SextantSample.UWP/Assets/Square150x150Logo.scale-200.png
deleted file mode 100644
index f269619b..00000000
--- a/src/Sample/SextantSample.UWP/Assets/Square150x150Logo.scale-200.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7f3cb5738e8f05544445f79996a313f8b47dee22dbc9c7be859d2707710f0c73
-size 2937
diff --git a/src/Sample/SextantSample.UWP/Assets/Square44x44Logo.scale-200.png b/src/Sample/SextantSample.UWP/Assets/Square44x44Logo.scale-200.png
deleted file mode 100644
index 818d96d8..00000000
--- a/src/Sample/SextantSample.UWP/Assets/Square44x44Logo.scale-200.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:594492a25070951d7462c091d9f899a66f55ba992bb9b05d98d50f67cdfb2abe
-size 1647
diff --git a/src/Sample/SextantSample.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/src/Sample/SextantSample.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
deleted file mode 100644
index 8c010282..00000000
--- a/src/Sample/SextantSample.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:48cf9c22156a0b3d77982641f972785e7861a7257f7bcf155be7d5a12e1aa3d8
-size 1255
diff --git a/src/Sample/SextantSample.UWP/Assets/StoreLogo.png b/src/Sample/SextantSample.UWP/Assets/StoreLogo.png
deleted file mode 100644
index 679f7d74..00000000
--- a/src/Sample/SextantSample.UWP/Assets/StoreLogo.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ae95e99a96251abaf8de15c9cdaddb8cefb1b8b320b10a4f1f4e1dc3c25c1b1a
-size 1451
diff --git a/src/Sample/SextantSample.UWP/Assets/Wide310x150Logo.scale-200.png b/src/Sample/SextantSample.UWP/Assets/Wide310x150Logo.scale-200.png
deleted file mode 100644
index 75789826..00000000
--- a/src/Sample/SextantSample.UWP/Assets/Wide310x150Logo.scale-200.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b5b7754832c08e58faacfe64ea4b9f8b59b52a658e4eea4aab3790cfb89faa03
-size 3204
diff --git a/src/Sample/SextantSample.UWP/Package.appxmanifest b/src/Sample/SextantSample.UWP/Package.appxmanifest
deleted file mode 100644
index f33abb50..00000000
--- a/src/Sample/SextantSample.UWP/Package.appxmanifest
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Package
-  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
-  xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
-  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
-  IgnorableNamespaces="uap mp">
-
-  <Identity
-    Name="6a57b37e-6e42-4550-ba93-c2309721a318"
-    Publisher="CN=leemc"
-    Version="1.0.0.0" />
-
-  <mp:PhoneIdentity PhoneProductId="6a57b37e-6e42-4550-ba93-c2309721a318" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
-
-  <Properties>
-    <DisplayName>SextantSample.UWP</DisplayName>
-    <PublisherDisplayName>leemc</PublisherDisplayName>
-    <Logo>Assets\StoreLogo.png</Logo>
-  </Properties>
-
-  <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
-  </Dependencies>
-
-  <Resources>
-    <Resource Language="x-generate"/>
-  </Resources>
-
-  <Applications>
-    <Application Id="App"
-      Executable="$targetnametoken$.exe"
-      EntryPoint="SextantSample.UWP.App">
-      <uap:VisualElements
-        DisplayName="SextantSample.UWP"
-        Square150x150Logo="Assets\Square150x150Logo.png"
-        Square44x44Logo="Assets\Square44x44Logo.png"
-        Description="SextantSample.UWP"
-        BackgroundColor="transparent">
-        <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png"/>
-        <uap:SplashScreen Image="Assets\SplashScreen.png" />
-      </uap:VisualElements>
-    </Application>
-  </Applications>
-
-  <Capabilities>
-    <Capability Name="internetClient" />
-  </Capabilities>
-</Package>
\ No newline at end of file
diff --git a/src/Sample/SextantSample.UWP/Properties/AssemblyInfo.cs b/src/Sample/SextantSample.UWP/Properties/AssemblyInfo.cs
deleted file mode 100644
index ab8fe06f..00000000
--- a/src/Sample/SextantSample.UWP/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("SextantSample.UWP")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("SextantSample.UWP")]
-[assembly: AssemblyCopyright("Copyright © .NET Foundation 2021")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: ComVisible(false)]
diff --git a/src/Sample/SextantSample.UWP/Properties/Default.rd.xml b/src/Sample/SextantSample.UWP/Properties/Default.rd.xml
deleted file mode 100644
index af00722c..00000000
--- a/src/Sample/SextantSample.UWP/Properties/Default.rd.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
-    This file contains Runtime Directives used by .NET Native. The defaults here are suitable for most
-    developers. However, you can modify these parameters to modify the behavior of the .NET Native
-    optimizer.
-
-    Runtime Directives are documented at https://go.microsoft.com/fwlink/?LinkID=391919
-
-    To fully enable reflection for App1.MyClass and all of its public/private members
-    <Type Name="App1.MyClass" Dynamic="Required All"/>
-
-    To enable dynamic creation of the specific instantiation of AppClass<T> over System.Int32
-    <TypeInstantiation Name="App1.AppClass" Arguments="System.Int32" Activate="Required Public" />
-
-    Using the Namespace directive to apply reflection policy to all the types in a particular namespace
-    <Namespace Name="DataClasses.ViewModels" Serialize="All" />
--->
-
-<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
-  <Application>
-    <!--
-      An Assembly element with Name="*Application*" applies to all assemblies in
-      the application package. The asterisks are not wildcards.
-    -->
-    <Assembly Name="*Application*" Dynamic="Required All" />
-    
-    
-    <!-- Add your application specific runtime directives here. -->
-
-
-  </Application>
-</Directives>
\ No newline at end of file
diff --git a/src/Sample/SextantSample.UWP/SextantDefaultExceptionHandler.cs b/src/Sample/SextantSample.UWP/SextantDefaultExceptionHandler.cs
deleted file mode 100644
index 84d9ca88..00000000
--- a/src/Sample/SextantSample.UWP/SextantDefaultExceptionHandler.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Reactive.Concurrency;
-using ReactiveUI;
-
-namespace SextantSample.UWP
-{
-	public class SextantDefaultExceptionHandler : IObserver<Exception>
-	{
-		public void OnNext(Exception ex)
-		{
-			if (Debugger.IsAttached)
-			{
-				Debugger.Break();
-			}
-
-			RxApp.MainThreadScheduler.Schedule(() => { throw ex; });
-		}
-
-		public void OnError(Exception ex)
-		{
-			if (Debugger.IsAttached)
-			{
-				Debugger.Break();
-			}
-			RxApp.MainThreadScheduler.Schedule(() => { throw ex; });
-		}
-
-		public void OnCompleted()
-		{
-			if (Debugger.IsAttached) Debugger.Break();
-			RxApp.MainThreadScheduler.Schedule(() => { throw new NotImplementedException(); });
-		}
-	}
-}
diff --git a/src/Sample/SextantSample.UWP/SextantSample.UWP.csproj b/src/Sample/SextantSample.UWP/SextantSample.UWP.csproj
deleted file mode 100644
index 29c59cc4..00000000
--- a/src/Sample/SextantSample.UWP/SextantSample.UWP.csproj
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProjectGuid>{30FC2A59-FFBA-4C10-9E8F-39C504DDA990}</ProjectGuid>
-    <OutputType>AppContainerExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>SextantSample.UWP</RootNamespace>
-    <AssemblyName>SextantSample.UWP</AssemblyName>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.18362.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
-    <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\ARM\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>ARM</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
-    <OutputPath>bin\ARM\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>ARM</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\ARM64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>ARM64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
-    <OutputPath>bin\ARM64\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>ARM64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
-  </PropertyGroup>
-  <PropertyGroup>
-    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="App.xaml.cs">
-      <DependentUpon>App.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SextantDefaultExceptionHandler.cs" />
-    <Compile Include="Views\BlueNavigationView.cs" />
-    <Compile Include="Views\FirstModalView.xaml.cs">
-      <DependentUpon>FirstModalView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\GreenView.xaml.cs">
-      <DependentUpon>GreenView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\HomeView.xaml.cs">
-      <DependentUpon>HomeView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\RedView.xaml.cs">
-      <DependentUpon>RedView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\SecondModalView.xaml.cs">
-      <DependentUpon>SecondModalView.xaml</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <AppxManifest Include="Package.appxmanifest">
-      <SubType>Designer</SubType>
-    </AppxManifest>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Properties\Default.rd.xml" />
-    <Content Include="Assets\LockScreenLogo.scale-200.png" />
-    <Content Include="Assets\SplashScreen.scale-200.png" />
-    <Content Include="Assets\Square150x150Logo.scale-200.png" />
-    <Content Include="Assets\Square44x44Logo.scale-200.png" />
-    <Content Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
-    <Content Include="Assets\StoreLogo.png" />
-    <Content Include="Assets\Wide310x150Logo.scale-200.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <ApplicationDefinition Include="App.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </ApplicationDefinition>
-    <Page Include="Views\FirstModalView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\GreenView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\HomeView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\RedView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\SecondModalView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.14</Version>
-    </PackageReference>
-    <PackageReference Include="ReactiveUI">
-      <Version>13.*</Version>
-    </PackageReference>
-    <PackageReference Include="Xamarin.Forms" Version="5.0.*" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Sextant\Sextant.csproj">
-      <Project>{d6b84899-4afc-4e6c-9c3f-005f21df5a52}</Project>
-      <Name>Sextant</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\SextantSample.Core\SextantSample.ViewModels.csproj">
-      <Project>{69790d55-7aa2-4d01-8d1d-70cc25aae8f0}</Project>
-      <Name>SextantSample.ViewModels</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup />
-  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
-    <VisualStudioVersion>14.0</VisualStudioVersion>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
diff --git a/src/Sample/SextantSample.UWP/Views/BlueNavigationView.cs b/src/Sample/SextantSample.UWP/Views/BlueNavigationView.cs
deleted file mode 100644
index 77e26db2..00000000
--- a/src/Sample/SextantSample.UWP/Views/BlueNavigationView.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reactive.Concurrency;
-using System.Text;
-using System.Threading.Tasks;
-using ReactiveUI;
-using Windows.UI.Xaml.Controls;
-
-namespace SextantSample.UWP.Views
-{
-    public class BlueNavigationView : Sextant.NavigationView, IViewFor
-    {
-        public BlueNavigationView() : base(RxApp.MainThreadScheduler, RxApp.TaskpoolScheduler, ViewLocator.Current)
-        {
-            var titleBar = Windows.UI.ViewManagement.ApplicationView.GetForCurrentView().TitleBar;
-            titleBar.BackgroundColor = Windows.UI.Colors.Blue;
-            titleBar.ForegroundColor = Windows.UI.Colors.White;
-        }
-
-        public object ViewModel { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
-    }
-}
diff --git a/src/Sample/SextantSample.UWP/Views/FirstModalView.xaml b/src/Sample/SextantSample.UWP/Views/FirstModalView.xaml
deleted file mode 100644
index b0c4df35..00000000
--- a/src/Sample/SextantSample.UWP/Views/FirstModalView.xaml
+++ /dev/null
@@ -1,19 +0,0 @@
-<Page
-    x:Class="SextantSample.UWP.Views.FirstModalView"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:SextantSample.UWP.Views"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
-    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-
-    <StackPanel Padding="0,40,0,0">
-        <TextBlock Style="{StaticResource SubheaderTextBlockStyle}"
-                   Text="First Modal"/>
-        <Button x:Name="OpenSecondModal" Content="Second Modal"
-                Command="{x:Bind ViewModel.OpenModal}"/>
-        <Button x:Name="PopModal" Content="Pop Modal"
-                Command="{x:Bind ViewModel.PopModal}"/>
-    </StackPanel>
-</Page>
diff --git a/src/Sample/SextantSample.UWP/Views/FirstModalView.xaml.cs b/src/Sample/SextantSample.UWP/Views/FirstModalView.xaml.cs
deleted file mode 100644
index 3a3b2302..00000000
--- a/src/Sample/SextantSample.UWP/Views/FirstModalView.xaml.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-using ReactiveUI;
-using SextantSample.ViewModels;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-
-// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
-
-namespace SextantSample.UWP.Views
-{
-    /// <summary>
-    /// An empty page that can be used on its own or navigated to within a Frame.
-    /// </summary>
-    public sealed partial class FirstModalView : Page, IViewFor<FirstModalViewModel>
-    {
-        public FirstModalView()
-        {
-            this.InitializeComponent();
-                        
-            Interactions
-                .ErrorMessage
-                .RegisterHandler(async x =>
-                {
-                    var dialog = new Windows.UI.Popups.MessageDialog(x.Input.Message, "Error");
-                    dialog.Commands.Add(new Windows.UI.Popups.UICommand("Done"));
-                    _ = await dialog.ShowAsync();
-                    x.SetOutput(true);
-                });
-        }
-
-        public static readonly DependencyProperty ViewModelProperty = DependencyProperty
-           .Register(nameof(ViewModel), typeof(FirstModalViewModel), typeof(FirstModalView), null);
-
-        public FirstModalViewModel ViewModel
-        {
-            get => (FirstModalViewModel)GetValue(ViewModelProperty);
-            set => SetValue(ViewModelProperty, value);
-        }
-
-        object IViewFor.ViewModel { get => ViewModel; set => ViewModel = (FirstModalViewModel)value; }
-    }
-}
diff --git a/src/Sample/SextantSample.UWP/Views/GreenView.xaml b/src/Sample/SextantSample.UWP/Views/GreenView.xaml
deleted file mode 100644
index fe050d1a..00000000
--- a/src/Sample/SextantSample.UWP/Views/GreenView.xaml
+++ /dev/null
@@ -1,21 +0,0 @@
-<Page
-    x:Class="SextantSample.UWP.Views.GreenView"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:SextantSample.UWP.Views"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
-    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-
-    <StackPanel Background="#043927"
-                Padding="0,40,0,0">
-        <TextBlock Style="{StaticResource SubheaderTextBlockStyle}"
-                   Foreground="White"
-                   Text="Green View"/>
-        <Button x:Name="Modal" 
-                Foreground="White" 
-                Command="{x:Bind ViewModel.OpenModal}"
-                Content="Open Modal" />
-    </StackPanel>
-</Page>
diff --git a/src/Sample/SextantSample.UWP/Views/GreenView.xaml.cs b/src/Sample/SextantSample.UWP/Views/GreenView.xaml.cs
deleted file mode 100644
index 2fdbfa24..00000000
--- a/src/Sample/SextantSample.UWP/Views/GreenView.xaml.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using ReactiveUI;
-using SextantSample.ViewModels;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-
-// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
-
-namespace SextantSample.UWP.Views
-{
-    /// <summary>
-    /// An empty page that can be used on its own or navigated to within a Frame.
-    /// </summary>
-    public sealed partial class GreenView : Page, IViewFor<GreenViewModel>
-    {
-        public GreenView() => this.InitializeComponent();
-
-        public static readonly DependencyProperty ViewModelProperty = DependencyProperty
-           .Register(nameof(ViewModel), typeof(GreenViewModel), typeof(GreenView), null);
-
-        public GreenViewModel ViewModel
-        {
-            get => (GreenViewModel)GetValue(ViewModelProperty);
-            set => SetValue(ViewModelProperty, value);
-        }
-
-        object IViewFor.ViewModel { get => ViewModel; set => ViewModel = (GreenViewModel)value; }
-    }
-}
diff --git a/src/Sample/SextantSample.UWP/Views/HomeView.xaml b/src/Sample/SextantSample.UWP/Views/HomeView.xaml
deleted file mode 100644
index f17c8067..00000000
--- a/src/Sample/SextantSample.UWP/Views/HomeView.xaml
+++ /dev/null
@@ -1,21 +0,0 @@
-<Page
-    x:Class="SextantSample.UWP.Views.HomeView"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:SextantSample.UWP.Views"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
-    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-
-    <StackPanel Padding="0,40,0,0">
-        <TextBlock Style="{StaticResource SubheaderTextBlockStyle}"
-                   Text="Home View"/>
-        <Button x:Name="FirstModalButton" Content="First Modal"
-                Command="{x:Bind ViewModel.OpenModal}"/>
-        <Button x:Name="PushPage" Content="Push Red Page"
-                Command="{x:Bind ViewModel.PushPage}"/>
-        <Button x:Name="PushGenericPage" Content="Push Green Page"
-                Command="{x:Bind ViewModel.PushGenericPage}"/>
-    </StackPanel>
-</Page>
diff --git a/src/Sample/SextantSample.UWP/Views/HomeView.xaml.cs b/src/Sample/SextantSample.UWP/Views/HomeView.xaml.cs
deleted file mode 100644
index 36376c1c..00000000
--- a/src/Sample/SextantSample.UWP/Views/HomeView.xaml.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System.Reactive.Disposables;
-using ReactiveUI;
-using SextantSample.ViewModels;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-
-// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
-
-namespace SextantSample.UWP.Views
-{
-    /// <summary>
-    /// An empty page that can be used on its own or navigated to within a Frame.
-    /// </summary>
-    public sealed partial class HomeView : Page, ReactiveUI.IViewFor<HomeViewModel>
-    {
-        public HomeView() => this.InitializeComponent();
-
-        public static readonly DependencyProperty ViewModelProperty = DependencyProperty
-            .Register(nameof(ViewModel), typeof(HomeViewModel), typeof(HomeView), null);
-
-        public HomeViewModel ViewModel
-        {
-            get => (HomeViewModel)GetValue(ViewModelProperty);
-            set => SetValue(ViewModelProperty, value);
-        }
-
-        object IViewFor.ViewModel { get => ViewModel; set => ViewModel = (HomeViewModel)value; }
-    }
-}
diff --git a/src/Sample/SextantSample.UWP/Views/RedView.xaml b/src/Sample/SextantSample.UWP/Views/RedView.xaml
deleted file mode 100644
index a822dc38..00000000
--- a/src/Sample/SextantSample.UWP/Views/RedView.xaml
+++ /dev/null
@@ -1,25 +0,0 @@
-<Page
-    x:Class="SextantSample.UWP.Views.RedView"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:SextantSample.UWP.Views"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
-    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-
-    <StackPanel Background="Red"
-                Padding="0,40,0,0">
-        <TextBlock Style="{StaticResource SubheaderTextBlockStyle}"
-                   Foreground="White"
-                   Text="First Modal"/>
-        <Button x:Name="PopModal" Content="Pop Modal" Foreground="White"
-                Command="{x:Bind ViewModel.PopModal}"/>
-        <Button x:Name="PushPage" Content="Push Another Red Page" Foreground="White"
-                Command="{x:Bind ViewModel.PushPage}"/>
-        <Button x:Name="PopPage" Content="Pop Page" Foreground="White"
-                Command="{x:Bind ViewModel.PopPage}"/>
-        <Button x:Name="PopToRoot" Content="Pop To Root" Foreground="White"
-                Command="{x:Bind ViewModel.PopToRoot}"/>
-    </StackPanel>
-</Page>
diff --git a/src/Sample/SextantSample.UWP/Views/RedView.xaml.cs b/src/Sample/SextantSample.UWP/Views/RedView.xaml.cs
deleted file mode 100644
index 1cb0530b..00000000
--- a/src/Sample/SextantSample.UWP/Views/RedView.xaml.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-using ReactiveUI;
-using SextantSample.ViewModels;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-
-// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
-
-namespace SextantSample.UWP.Views
-{
-    /// <summary>
-    /// An empty page that can be used on its own or navigated to within a Frame.
-    /// </summary>
-    public sealed partial class RedView : Page, IViewFor<RedViewModel>
-    {
-        public RedView()
-        {
-            this.InitializeComponent();
-
-            Interactions
-                    .ErrorMessage
-                    .RegisterHandler(async x =>
-                    {
-                        var dialog = new Windows.UI.Popups.MessageDialog(x.Input.Message, "Error");
-                        dialog.Commands.Add(new Windows.UI.Popups.UICommand("Done"));
-                        _ = await dialog.ShowAsync();
-                        x.SetOutput(true);
-                    });
-        }
-
-        public static readonly DependencyProperty ViewModelProperty = DependencyProperty
-         .Register(nameof(ViewModel), typeof(RedViewModel), typeof(RedView), null);
-
-        public RedViewModel ViewModel
-        {
-            get => (RedViewModel)GetValue(ViewModelProperty);
-            set => SetValue(ViewModelProperty, value);
-        }
-
-        object IViewFor.ViewModel { get => ViewModel; set => ViewModel = (RedViewModel)value; }
-    }
-}
diff --git a/src/Sample/SextantSample.UWP/Views/SecondModalView.xaml b/src/Sample/SextantSample.UWP/Views/SecondModalView.xaml
deleted file mode 100644
index 1d380125..00000000
--- a/src/Sample/SextantSample.UWP/Views/SecondModalView.xaml
+++ /dev/null
@@ -1,19 +0,0 @@
-<Page
-    x:Class="SextantSample.UWP.Views.SecondModalView"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:SextantSample.UWP.Views"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
-    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-
-    <StackPanel Padding="0,40,0,0">
-        <TextBlock Style="{StaticResource SubheaderTextBlockStyle}"
-                   Text="Second Modal"/>
-        <Button x:Name="PushPage" Content="Push Page"
-                Command="{x:Bind ViewModel.PushPage}"/>
-        <Button x:Name="PopModal" Content="Pop Modal" 
-                Command="{x:Bind ViewModel.PopModal}"/>
-    </StackPanel>
-</Page>
diff --git a/src/Sample/SextantSample.UWP/Views/SecondModalView.xaml.cs b/src/Sample/SextantSample.UWP/Views/SecondModalView.xaml.cs
deleted file mode 100644
index 6f698093..00000000
--- a/src/Sample/SextantSample.UWP/Views/SecondModalView.xaml.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using System;
-using ReactiveUI;
-using SextantSample.ViewModels;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-
-// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
-
-namespace SextantSample.UWP.Views
-{
-    /// <summary>
-    /// An empty page that can be used on its own or navigated to within a Frame.
-    /// </summary>
-    public sealed partial class SecondModalView : Page, IViewFor<SecondModalViewModel>
-    {
-        public SecondModalView()
-        {
-            this.InitializeComponent();
-
-            Interactions
-                .ErrorMessage
-                .RegisterHandler(async x =>
-                {
-                    var dialog = new Windows.UI.Popups.MessageDialog(x.Input.Message, "Error");
-                    dialog.Commands.Add(new Windows.UI.Popups.UICommand("Done"));
-                    _ = await dialog.ShowAsync();
-                    x.SetOutput(true);
-                });
-        }
-
-        public static readonly DependencyProperty ViewModelProperty = DependencyProperty
-           .Register(nameof(ViewModel), typeof(SecondModalViewModel), typeof(SecondModalView), null);
-
-        public SecondModalViewModel ViewModel
-        {
-            get => (SecondModalViewModel)GetValue(ViewModelProperty);
-            set => SetValue(ViewModelProperty, value);
-        }
-
-        object IViewFor.ViewModel { get => ViewModel; set => ViewModel = (SecondModalViewModel)value; }
-    }
-}
diff --git a/src/Sample/SextantSample.WPF/App.xaml b/src/Sample/SextantSample.WPF/App.xaml
deleted file mode 100644
index 735695a0..00000000
--- a/src/Sample/SextantSample.WPF/App.xaml
+++ /dev/null
@@ -1,5 +0,0 @@
-<Application x:Class="SextantSample.WPF.App"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:SextantSample.WPF"
-             StartupUri="MainWindow.xaml" />
diff --git a/src/Sample/SextantSample.WPF/App.xaml.cs b/src/Sample/SextantSample.WPF/App.xaml.cs
deleted file mode 100644
index db4c8ec0..00000000
--- a/src/Sample/SextantSample.WPF/App.xaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for full license information.
-
-namespace SextantSample.WPF;
-
-/// <summary>
-/// App.
-/// </summary>
-/// <seealso cref="System.Windows.Application" />
-public partial class App;
diff --git a/src/Sample/SextantSample.WPF/AssemblyInfo.cs b/src/Sample/SextantSample.WPF/AssemblyInfo.cs
deleted file mode 100644
index 407b3343..00000000
--- a/src/Sample/SextantSample.WPF/AssemblyInfo.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for full license information.
-
-using System.Windows;
-
-[assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]
diff --git a/src/Sample/SextantSample.WPF/MainWindow.xaml b/src/Sample/SextantSample.WPF/MainWindow.xaml
deleted file mode 100644
index cec26402..00000000
--- a/src/Sample/SextantSample.WPF/MainWindow.xaml
+++ /dev/null
@@ -1,11 +0,0 @@
-<wpf:FormsApplicationPage
-    x:Class="SextantSample.WPF.MainWindow"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:wpf="clr-namespace:Xamarin.Forms.Platform.WPF;assembly=Xamarin.Forms.Platform.WPF"
-    Title="MainWindow"
-    Width="800"
-    Height="450"
-    mc:Ignorable="d" />
diff --git a/src/Sample/SextantSample.WPF/MainWindow.xaml.cs b/src/Sample/SextantSample.WPF/MainWindow.xaml.cs
deleted file mode 100644
index bce9d793..00000000
--- a/src/Sample/SextantSample.WPF/MainWindow.xaml.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for full license information.
-
-using Xamarin.Forms;
-
-namespace SextantSample.WPF;
-
-/// <summary>
-/// MainWindow.
-/// </summary>
-/// <seealso cref="Xamarin.Forms.Platform.WPF.FormsApplicationPage" />
-/// <seealso cref="System.Windows.Markup.IComponentConnector" />
-public partial class MainWindow
-{
-    /// <summary>
-    /// Initializes a new instance of the <see cref="MainWindow"/> class.
-    /// </summary>
-    public MainWindow()
-    {
-        InitializeComponent();
-
-        Forms.Init();
-        LoadApplication(new SextantSample.App());
-    }
-}
diff --git a/src/Sample/SextantSample.WPF/SextantSample.WPF.csproj b/src/Sample/SextantSample.WPF/SextantSample.WPF.csproj
deleted file mode 100644
index 3757213b..00000000
--- a/src/Sample/SextantSample.WPF/SextantSample.WPF.csproj
+++ /dev/null
@@ -1,19 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
-    <UseWPF>true</UseWPF>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="ReactiveUI.WPF" />
-    <PackageReference Include="Xamarin.Forms.Platform.WPF" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\SextantSample\SextantSample.csproj" />
-  </ItemGroup>
-  <!-- Workaround for Xamarin.Forms + WPF build issue -->
-  <!-- See also: https://github.com/xamarin/Xamarin.Forms/issues/13217 -->
-  <ItemGroup>
-    <EmbeddedResource Remove="**/*.xaml" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/Sample/SextantSample.iOS/AppDelegate.cs b/src/Sample/SextantSample.iOS/AppDelegate.cs
deleted file mode 100644
index 99aa89d4..00000000
--- a/src/Sample/SextantSample.iOS/AppDelegate.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-
-using Foundation;
-using UIKit;
-
-namespace SextantSample.iOS
-{
-    // The UIApplicationDelegate for the application. This class is responsible for launching the 
-    // User Interface of the application, as well as listening (and optionally responding) to 
-    // application events from iOS.
-    [Register("AppDelegate")]
-    public class AppDelegate : global::Xamarin.Forms.Platform.iOS.FormsApplicationDelegate
-    {
-        //
-        // This method is invoked when the application has loaded and is ready to run. In this 
-        // method you should instantiate the window, load the UI into it and then make the window
-        // visible.
-        //
-        // You have 17 seconds to return from this method, or iOS will terminate your application.
-        //
-        public override bool FinishedLaunching(UIApplication app, NSDictionary options)
-        {
-            Xamarin.Forms.Forms.Init();
-            LoadApplication(new App());
-
-            return base.FinishedLaunching(app, options);
-        }
-    }
-}
diff --git a/src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
deleted file mode 100644
index 98f4d035..00000000
--- a/src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ /dev/null
@@ -1,117 +0,0 @@
-{
-  "images": [
-    {
-      "scale": "2x",
-      "size": "20x20",
-      "idiom": "iphone",
-      "filename": "Icon40.png"
-    },
-    {
-      "scale": "3x",
-      "size": "20x20",
-      "idiom": "iphone",
-      "filename": "Icon60.png"
-    },
-    {
-      "scale": "2x",
-      "size": "29x29",
-      "idiom": "iphone",
-      "filename": "Icon58.png"
-    },
-    {
-      "scale": "3x",
-      "size": "29x29",
-      "idiom": "iphone",
-      "filename": "Icon87.png"
-    },
-    {
-      "scale": "2x",
-      "size": "40x40",
-      "idiom": "iphone",
-      "filename": "Icon80.png"
-    },
-    {
-      "scale": "3x",
-      "size": "40x40",
-      "idiom": "iphone",
-      "filename": "Icon120.png"
-    },
-    {
-      "scale": "2x",
-      "size": "60x60",
-      "idiom": "iphone",
-      "filename": "Icon120.png"
-    },
-    {
-      "scale": "3x",
-      "size": "60x60",
-      "idiom": "iphone",
-      "filename": "Icon180.png"
-    },
-    {
-      "scale": "1x",
-      "size": "20x20",
-      "idiom": "ipad",
-      "filename": "Icon20.png"
-    },
-    {
-      "scale": "2x",
-      "size": "20x20",
-      "idiom": "ipad",
-      "filename": "Icon40.png"
-    },
-    {
-      "scale": "1x",
-      "size": "29x29",
-      "idiom": "ipad",
-      "filename": "Icon29.png"
-    },
-    {
-      "scale": "2x",
-      "size": "29x29",
-      "idiom": "ipad",
-      "filename": "Icon58.png"
-    },
-    {
-      "scale": "1x",
-      "size": "40x40",
-      "idiom": "ipad",
-      "filename": "Icon40.png"
-    },
-    {
-      "scale": "2x",
-      "size": "40x40",
-      "idiom": "ipad",
-      "filename": "Icon80.png"
-    },
-    {
-      "scale": "1x",
-      "size": "76x76",
-      "idiom": "ipad",
-      "filename": "Icon76.png"
-    },
-    {
-      "scale": "2x",
-      "size": "76x76",
-      "idiom": "ipad",
-      "filename": "Icon152.png"
-    },
-    {
-      "scale": "2x",
-      "size": "83.5x83.5",
-      "idiom": "ipad",
-      "filename": "Icon167.png"
-    },
-    {
-      "scale": "1x",
-      "size": "1024x1024",
-      "idiom": "ios-marketing",
-      "filename": "Icon1024.png"
-    }
-  ],
-  "properties": {},
-  "info": {
-    "version": 1,
-    "author": "xcode"
-  }
-}
\ No newline at end of file
diff --git a/src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon1024.png b/src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon1024.png
deleted file mode 100644
index 00ea39f4..00000000
--- a/src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon1024.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cc7f7cb40a3d7b2d7639e2a15b62bc3404d779a56c8863ae492218fb3519452e
-size 70429
diff --git a/src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon120.png b/src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon120.png
deleted file mode 100644
index d15e0877..00000000
--- a/src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon120.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:faf908f37fa0eb73f531d8c46ef422df52252b9bca73cd726ec299bf92852fb6
-size 3773
diff --git a/src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon152.png b/src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon152.png
deleted file mode 100644
index e08d2743..00000000
--- a/src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon152.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8b98982a7dd52bbaea5515ce0681e7b1180eaddf85589cc6a261c5b1c98336d9
-size 4750
diff --git a/src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon167.png b/src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon167.png
deleted file mode 100644
index b3cf0e41..00000000
--- a/src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon167.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ed32a51128101cd81f0569f209f415ca21315591fc46b1db5533f254d4db6c69
-size 4692
diff --git a/src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon180.png b/src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon180.png
deleted file mode 100644
index 29144004..00000000
--- a/src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon180.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d11de68c36358cccbb16a82ba7645c3ab6c7568b4cd5f29f7b7879f38a99495e
-size 5192
diff --git a/src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon20.png b/src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon20.png
deleted file mode 100644
index 7cede99d..00000000
--- a/src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon20.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:de96a3ba670c8163ba94ef578bb897b951b14c475ac1fecab06b297af967bd6f
-size 1313
diff --git a/src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon29.png b/src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon29.png
deleted file mode 100644
index b3b8a23e..00000000
--- a/src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon29.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:653a3d75c42c01ce4dd60c0aa0b59f6de548a016a2d70cc9aaa3a5e9664e78c9
-size 845
diff --git a/src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon40.png b/src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon40.png
deleted file mode 100644
index d8cb0c9e..00000000
--- a/src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon40.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:09242c80c04a97fc083bca554f5c992f4ae090ffaa858af7a92613b5cdb07354
-size 1101
diff --git a/src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon58.png b/src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon58.png
deleted file mode 100644
index 5b90b812..00000000
--- a/src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon58.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:04cfee2b3a4feb32a77bb953c8453a0bb416f48906a9448b5edc355c0d68da86
-size 1761
diff --git a/src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon60.png b/src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon60.png
deleted file mode 100644
index e15f3192..00000000
--- a/src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon60.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bf145cb811bd1095bd94aadd17e3ed38b489dde1e8ce58ad5e9de090bb3556f8
-size 2537
diff --git a/src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon76.png b/src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon76.png
deleted file mode 100644
index a80c4e0f..00000000
--- a/src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon76.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:170b1b2119e0fff597104534ab50b7c31b930eb76b24bfc9bd7508e1b489bc30
-size 2332
diff --git a/src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon80.png b/src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon80.png
deleted file mode 100644
index c6ef7b4b..00000000
--- a/src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon80.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:538ba04ed28b7eec3917fa1a3226e4b023ffc263bb762891a2a25e2c95f9f394
-size 2454
diff --git a/src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon87.png b/src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon87.png
deleted file mode 100644
index 306a529c..00000000
--- a/src/Sample/SextantSample.iOS/Assets.xcassets/AppIcon.appiconset/Icon87.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a5bf0830dc6cffbf5685ee16b11c9e04b08466cce1ddd4c9598f9ad8e7952c6f
-size 2758
diff --git a/src/Sample/SextantSample.iOS/Entitlements.plist b/src/Sample/SextantSample.iOS/Entitlements.plist
deleted file mode 100644
index e9a3005f..00000000
--- a/src/Sample/SextantSample.iOS/Entitlements.plist
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-</dict>
-</plist>
-
diff --git a/src/Sample/SextantSample.iOS/Info.plist b/src/Sample/SextantSample.iOS/Info.plist
deleted file mode 100644
index 32f141ba..00000000
--- a/src/Sample/SextantSample.iOS/Info.plist
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>UIDeviceFamily</key>
-	<array>
-		<integer>1</integer>
-		<integer>2</integer>
-	</array>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>MinimumOSVersion</key>
-	<string>8.0</string>
-	<key>CFBundleDisplayName</key>
-	<string>SextantSample</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.giusepe.SextantSample</string>
-	<key>CFBundleVersion</key>
-	<string>1.0</string>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>CFBundleName</key>
-	<string>SextantSample</string>
-	<key>XSAppIconAssets</key>
-	<string>Assets.xcassets/AppIcon.appiconset</string>
-</dict>
-</plist>
diff --git a/src/Sample/SextantSample.iOS/Main.cs b/src/Sample/SextantSample.iOS/Main.cs
deleted file mode 100644
index 3323228c..00000000
--- a/src/Sample/SextantSample.iOS/Main.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-
-using UIKit;
-
-namespace SextantSample.iOS
-{
-    public static class Application
-    {
-        // This is the main entry point of the application.
-        public static void Main(string[] args) =>
-            // if you want to use a different Application Delegate class from "AppDelegate"
-            // you can specify it here.
-            UIApplication.Main(args, null, "AppDelegate");
-    }
-}
diff --git a/src/Sample/SextantSample.iOS/Properties/AssemblyInfo.cs b/src/Sample/SextantSample.iOS/Properties/AssemblyInfo.cs
deleted file mode 100644
index c5cdd7ac..00000000
--- a/src/Sample/SextantSample.iOS/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("SextantSample.iOS")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("SextantSample.iOS")]
-[assembly: AssemblyCopyright("Copyright ©  2014")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("72bdc44f-c588-44f3-b6df-9aace7daafdd")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/Sample/SextantSample.iOS/Resources/Default-568h@2x.png b/src/Sample/SextantSample.iOS/Resources/Default-568h@2x.png
deleted file mode 100644
index 1879d94e..00000000
--- a/src/Sample/SextantSample.iOS/Resources/Default-568h@2x.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:10eaeb5095d8d61941eab7ff58132727c467542efebdbdfc61583ff03c79206b
-size 8884
diff --git a/src/Sample/SextantSample.iOS/Resources/Default-Portrait.png b/src/Sample/SextantSample.iOS/Resources/Default-Portrait.png
deleted file mode 100644
index 1cfd9b69..00000000
--- a/src/Sample/SextantSample.iOS/Resources/Default-Portrait.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2f79839ed7826658f68d6f9b78d3683aea06c52782970bf05eaf3f189340487e
-size 10710
diff --git a/src/Sample/SextantSample.iOS/Resources/Default-Portrait@2x.png b/src/Sample/SextantSample.iOS/Resources/Default-Portrait@2x.png
deleted file mode 100644
index c50a51e4..00000000
--- a/src/Sample/SextantSample.iOS/Resources/Default-Portrait@2x.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e0f6fe0f2c7861b27f833d66631a944161a094a75819a02c3acf7f4ac5dc0ad6
-size 34540
diff --git a/src/Sample/SextantSample.iOS/Resources/Default.png b/src/Sample/SextantSample.iOS/Resources/Default.png
deleted file mode 100644
index faac8579..00000000
--- a/src/Sample/SextantSample.iOS/Resources/Default.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2c8e7ff274347291e4bceba1a7b8c2811e6346994732d86ad31a21ed8dc3e9ec
-size 7243
diff --git a/src/Sample/SextantSample.iOS/Resources/Default@2x.png b/src/Sample/SextantSample.iOS/Resources/Default@2x.png
deleted file mode 100644
index 40ddf908..00000000
--- a/src/Sample/SextantSample.iOS/Resources/Default@2x.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6a4a6ddba32b0253bbd267c1ba23f7c3cacf39a1f3ceeaea97427a13149de3dd
-size 8368
diff --git a/src/Sample/SextantSample.iOS/Resources/LaunchScreen.storyboard b/src/Sample/SextantSample.iOS/Resources/LaunchScreen.storyboard
deleted file mode 100644
index f12b9368..00000000
--- a/src/Sample/SextantSample.iOS/Resources/LaunchScreen.storyboard
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6245" systemVersion="13F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="X5k-f2-b5h">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238" />
-    </dependencies>
-    <scenes>
-        <!--View Controller-->
-        <scene sceneID="gAE-YM-kbH">
-            <objects>
-                <viewController id="X5k-f2-b5h" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="Y8P-hJ-Z43" />
-                        <viewControllerLayoutGuide type="bottom" id="9ZL-r4-8FZ" />
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="yd7-JS-zBw">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600" />
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" />
-                        <subviews>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" misplaced="YES" image="Icon-60.png" translatesAutoresizingMaskIntoConstraints="NO" id="23">
-                                <rect key="frame" x="270" y="270" width="60" height="60" />
-                                <rect key="contentStretch" x="0.0" y="0.0" width="0.0" height="0.0" />
-                            </imageView>
-                        </subviews>
-                        <color key="backgroundColor" red="0.20392156862745098" green="0.59607843137254901" blue="0.85882352941176465" alpha="1" colorSpace="calibratedRGB" />
-                        <constraints>
-                            <constraint firstItem="23" firstAttribute="centerY" secondItem="yd7-JS-zBw" secondAttribute="centerY" priority="1" id="39" />
-                            <constraint firstItem="23" firstAttribute="centerX" secondItem="yd7-JS-zBw" secondAttribute="centerX" priority="1" id="41" />
-                        </constraints>
-                    </view>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="XAI-xm-WK6" userLabel="First Responder" sceneMemberID="firstResponder" />
-            </objects>
-            <point key="canvasLocation" x="349" y="339" />
-        </scene>
-    </scenes>
-    <resources>
-        <image name="Icon-60.png" width="180" height="180" />
-    </resources>
-</document>
\ No newline at end of file
diff --git a/src/Sample/SextantSample.iOS/SextantSample.iOS.csproj b/src/Sample/SextantSample.iOS/SextantSample.iOS.csproj
deleted file mode 100644
index 586a8ade..00000000
--- a/src/Sample/SextantSample.iOS/SextantSample.iOS.csproj
+++ /dev/null
@@ -1,219 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{A5BBADB1-F348-49CD-8264-59B5BE8E9F17}</ProjectGuid>
-    <ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <TemplateGuid>{6143fdea-f3c2-4a09-aafa-6e230626515e}</TemplateGuid>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>SextantSample.iOS</RootNamespace>
-    <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
-    <AssemblyName>SextantSample.iOS</AssemblyName>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\iPhoneSimulator\Debug</OutputPath>
-    <DefineConstants>__IOS__;__MOBILE__;__UNIFIED__;DEBUG;LOGGING</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <MtouchArch>x86_64</MtouchArch>
-    <MtouchLink>None</MtouchLink>
-    <MtouchDebug>true</MtouchDebug>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\iPhoneSimulator\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <MtouchLink>None</MtouchLink>
-    <MtouchArch>x86_64</MtouchArch>
-    <ConsolePause>false</ConsolePause>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\iPhone\Debug</OutputPath>
-    <DefineConstants>DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <MtouchArch>ARM64</MtouchArch>
-    <CodesignKey>iPhone Developer</CodesignKey>
-    <MtouchDebug>true</MtouchDebug>
-    <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\iPhone\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <MtouchArch>ARM64</MtouchArch>
-    <ConsolePause>false</ConsolePause>
-    <CodesignKey>iPhone Developer</CodesignKey>
-    <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Ad-Hoc|iPhone' ">
-    <DebugType>none</DebugType>
-    <Optimize>True</Optimize>
-    <OutputPath>bin\iPhone\Ad-Hoc</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>False</ConsolePause>
-    <MtouchArch>ARM64</MtouchArch>
-    <BuildIpa>True</BuildIpa>
-    <CodesignProvision>Automatic:AdHoc</CodesignProvision>
-    <CodesignKey>iPhone Distribution</CodesignKey>
-    <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AppStore|iPhone' ">
-    <DebugType>none</DebugType>
-    <Optimize>True</Optimize>
-    <OutputPath>bin\iPhone\AppStore</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>False</ConsolePause>
-    <MtouchArch>ARM64</MtouchArch>
-    <CodesignProvision>Automatic:AppStore</CodesignProvision>
-    <CodesignKey>iPhone Distribution</CodesignKey>
-    <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Sample Release|AnyCPU' ">
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Sample Release</OutputPath>
-    <DefineConstants>
-    </DefineConstants>
-    <WarningLevel>4</WarningLevel>
-    <CodesignKey>iPhone Developer</CodesignKey>
-    <MtouchNoSymbolStrip>true</MtouchNoSymbolStrip>
-    <MtouchVerbosity>
-    </MtouchVerbosity>
-    <MtouchLink>
-    </MtouchLink>
-    <MtouchHttpClientHandler>
-    </MtouchHttpClientHandler>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>__IOS__;__MOBILE__;__UNIFIED__;DEBUG;LOGGING</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <LangVersion>7.3</LangVersion>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>__IOS__;__MOBILE__;__UNIFIED__;</DefineConstants>
-    <Optimize>true</Optimize>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <LangVersion>7.3</LangVersion>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Ad-Hoc|x64'">
-    <OutputPath>bin\x64\Ad-Hoc\</OutputPath>
-    <DefineConstants>__IOS__;__MOBILE__;__UNIFIED__;</DefineConstants>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <LangVersion>7.3</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'AppStore|x64'">
-    <OutputPath>bin\x64\AppStore\</OutputPath>
-    <DefineConstants>__IOS__;__MOBILE__;__UNIFIED__;</DefineConstants>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <LangVersion>7.3</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Sample Release|x64'">
-    <OutputPath>bin\x64\Sample Release\</OutputPath>
-    <DefineConstants>__IOS__;__MOBILE__;__UNIFIED__;</DefineConstants>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <LangVersion>7.3</LangVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="Main.cs" />
-    <Compile Include="AppDelegate.cs" />
-    <None Include="Entitlements.plist" />
-    <None Include="Info.plist" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <InterfaceDefinition Include="Resources\LaunchScreen.storyboard" />
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json">
-      <Visible>false</Visible>
-    </ImageAsset>
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon1024.png">
-      <Visible>false</Visible>
-    </ImageAsset>
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon180.png">
-      <Visible>false</Visible>
-    </ImageAsset>
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon167.png">
-      <Visible>false</Visible>
-    </ImageAsset>
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon152.png">
-      <Visible>false</Visible>
-    </ImageAsset>
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon120.png">
-      <Visible>false</Visible>
-    </ImageAsset>
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon87.png">
-      <Visible>false</Visible>
-    </ImageAsset>
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon80.png">
-      <Visible>false</Visible>
-    </ImageAsset>
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon76.png">
-      <Visible>false</Visible>
-    </ImageAsset>
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon60.png">
-      <Visible>false</Visible>
-    </ImageAsset>
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon58.png">
-      <Visible>false</Visible>
-    </ImageAsset>
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon40.png">
-      <Visible>false</Visible>
-    </ImageAsset>
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon29.png">
-      <Visible>false</Visible>
-    </ImageAsset>
-    <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Icon20.png">
-      <Visible>false</Visible>
-    </ImageAsset>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Core" />
-    <Reference Include="Xamarin.iOS" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="ReactiveUI.XamForms" />
-    <PackageReference Include="Xamarin.Forms" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\SextantSample\SextantSample.csproj">
-      <Project>{AB35E5EE-24AE-479A-909E-1FD941E152EF}</Project>
-      <Name>SextantSample</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Sextant\Sextant.csproj">
-      <Project>{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}</Project>
-      <Name>Sextant</Name>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
diff --git a/src/Sample/SextantSample.sln b/src/Sample/SextantSample.sln
index f9af6a25..48567d34 100644
--- a/src/Sample/SextantSample.sln
+++ b/src/Sample/SextantSample.sln
@@ -1,302 +1,63 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
-VisualStudioVersion = 17.0.31717.71
+VisualStudioVersion = 17.10.34916.146
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SextantSample", "SextantSample\SextantSample.csproj", "{AB35E5EE-24AE-479A-909E-1FD941E152EF}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sextant", "..\Sextant\Sextant.csproj", "{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sextant.XamForms", "..\Sextant.XamForms\Sextant.XamForms.csproj", "{4529D741-5B1E-4A05-9FDA-36625C12FC33}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SextantSample.ViewModels", "SextantSample.Core\SextantSample.ViewModels.csproj", "{5818A5AF-3FF6-4E68-80FC-604D4AEF156C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SextantSample.WPF", "SextantSample.WPF\SextantSample.WPF.csproj", "{B3804254-BA2D-4ECF-9A71-8685843A546F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libs", "Libs", "{637F2480-8306-4A3C-8E97-CB12D5FC3676}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sextant.Maui", "..\Sextant.Maui\Sextant.Maui.csproj", "{21A3E901-0F54-4970-B994-09F0574D42E0}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionConfig", "SolutionConfig", "{39EAC236-B550-4A5A-AF5C-DEB935D54F37}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionConfig", "SolutionConfig", "{F29AF2F3-DEC8-58BC-043A-1447862C832D}"
 	ProjectSection(SolutionItems) = preProject
+		..\..\.editorconfig = ..\..\.editorconfig
+		..\..\nuget.config = ..\..\nuget.config
+		..\..\README.md = ..\..\README.md
+		..\..\version.json = ..\..\version.json
 		..\Directory.build.props = ..\Directory.build.props
 		..\Directory.build.targets = ..\Directory.build.targets
 		..\Directory.Packages.props = ..\Directory.Packages.props
 		..\global.json = ..\global.json
 		..\stylecop.json = ..\stylecop.json
+		..\xunit.runner.json = ..\xunit.runner.json
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libs", "Libs", "{6C4D298B-81FB-2B6B-5AB6-46205EDDC72C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sextant", "..\Sextant\Sextant.csproj", "{23FAD9AC-3228-B931-96D7-313C66385B72}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sextant.Maui", "..\Sextant.Maui\Sextant.Maui.csproj", "{731C35C8-C3BB-2867-88CA-EF67291B98AC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SextantSample.Maui", "..\..\Samples\SextantSample.Maui\SextantSample.Maui.csproj", "{0A65FB55-9845-3253-1E62-54F5ECF8EC45}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SextantSample.ViewModels", "SextantSample.Core\SextantSample.ViewModels.csproj", "{8F56EB4C-63F9-C156-A8CE-0BC8C8DA73E1}"
+EndProject
 Global
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {110EFF91-41B2-44E2-960B-417D89D786DC}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
-		Ad-Hoc|iPhone = Ad-Hoc|iPhone
-		Ad-Hoc|iPhoneSimulator = Ad-Hoc|iPhoneSimulator
-		Ad-Hoc|x64 = Ad-Hoc|x64
-		AppStore|Any CPU = AppStore|Any CPU
-		AppStore|iPhone = AppStore|iPhone
-		AppStore|iPhoneSimulator = AppStore|iPhoneSimulator
-		AppStore|x64 = AppStore|x64
-		Debug|Any CPU = Debug|Any CPU
-		Debug|iPhone = Debug|iPhone
-		Debug|iPhoneSimulator = Debug|iPhoneSimulator
 		Debug|x64 = Debug|x64
-		Release|Any CPU = Release|Any CPU
-		Release|iPhone = Release|iPhone
-		Release|iPhoneSimulator = Release|iPhoneSimulator
 		Release|x64 = Release|x64
-		Sample Release|Any CPU = Sample Release|Any CPU
-		Sample Release|iPhone = Sample Release|iPhone
-		Sample Release|iPhoneSimulator = Sample Release|iPhoneSimulator
-		Sample Release|x64 = Sample Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Ad-Hoc|x64.ActiveCfg = Debug|x64
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Ad-Hoc|x64.Build.0 = Debug|x64
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.AppStore|x64.ActiveCfg = Debug|x64
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.AppStore|x64.Build.0 = Debug|x64
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Debug|x64.ActiveCfg = Debug|x64
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Release|iPhone.Build.0 = Release|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Release|x64.ActiveCfg = Release|x64
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Release|x64.Build.0 = Release|x64
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Sample Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Sample Release|Any CPU.Build.0 = Release|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Sample Release|iPhone.ActiveCfg = Release|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Sample Release|iPhone.Build.0 = Release|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Sample Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Sample Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Sample Release|x64.ActiveCfg = Release|x64
-		{AB35E5EE-24AE-479A-909E-1FD941E152EF}.Sample Release|x64.Build.0 = Release|x64
-		{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}.Ad-Hoc|x64.ActiveCfg = Debug|x64
-		{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}.Ad-Hoc|x64.Build.0 = Debug|x64
-		{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}.AppStore|x64.ActiveCfg = Debug|x64
-		{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}.AppStore|x64.Build.0 = Debug|x64
-		{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}.Debug|x64.Build.0 = Debug|Any CPU
-		{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}.Release|iPhone.Build.0 = Release|Any CPU
-		{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}.Release|x64.ActiveCfg = Release|x64
-		{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}.Release|x64.Build.0 = Release|x64
-		{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}.Sample Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}.Sample Release|Any CPU.Build.0 = Release|Any CPU
-		{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}.Sample Release|iPhone.ActiveCfg = Release|Any CPU
-		{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}.Sample Release|iPhone.Build.0 = Release|Any CPU
-		{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}.Sample Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}.Sample Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}.Sample Release|x64.ActiveCfg = Release|x64
-		{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3}.Sample Release|x64.Build.0 = Release|x64
-		{4529D741-5B1E-4A05-9FDA-36625C12FC33}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{4529D741-5B1E-4A05-9FDA-36625C12FC33}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{4529D741-5B1E-4A05-9FDA-36625C12FC33}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{4529D741-5B1E-4A05-9FDA-36625C12FC33}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{4529D741-5B1E-4A05-9FDA-36625C12FC33}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{4529D741-5B1E-4A05-9FDA-36625C12FC33}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{4529D741-5B1E-4A05-9FDA-36625C12FC33}.Ad-Hoc|x64.ActiveCfg = Debug|x64
-		{4529D741-5B1E-4A05-9FDA-36625C12FC33}.Ad-Hoc|x64.Build.0 = Debug|x64
-		{4529D741-5B1E-4A05-9FDA-36625C12FC33}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{4529D741-5B1E-4A05-9FDA-36625C12FC33}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{4529D741-5B1E-4A05-9FDA-36625C12FC33}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{4529D741-5B1E-4A05-9FDA-36625C12FC33}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{4529D741-5B1E-4A05-9FDA-36625C12FC33}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{4529D741-5B1E-4A05-9FDA-36625C12FC33}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{4529D741-5B1E-4A05-9FDA-36625C12FC33}.AppStore|x64.ActiveCfg = Debug|x64
-		{4529D741-5B1E-4A05-9FDA-36625C12FC33}.AppStore|x64.Build.0 = Debug|x64
-		{4529D741-5B1E-4A05-9FDA-36625C12FC33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4529D741-5B1E-4A05-9FDA-36625C12FC33}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4529D741-5B1E-4A05-9FDA-36625C12FC33}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{4529D741-5B1E-4A05-9FDA-36625C12FC33}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{4529D741-5B1E-4A05-9FDA-36625C12FC33}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{4529D741-5B1E-4A05-9FDA-36625C12FC33}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{4529D741-5B1E-4A05-9FDA-36625C12FC33}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4529D741-5B1E-4A05-9FDA-36625C12FC33}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4529D741-5B1E-4A05-9FDA-36625C12FC33}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4529D741-5B1E-4A05-9FDA-36625C12FC33}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{4529D741-5B1E-4A05-9FDA-36625C12FC33}.Release|iPhone.Build.0 = Release|Any CPU
-		{4529D741-5B1E-4A05-9FDA-36625C12FC33}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{4529D741-5B1E-4A05-9FDA-36625C12FC33}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{4529D741-5B1E-4A05-9FDA-36625C12FC33}.Release|x64.ActiveCfg = Release|x64
-		{4529D741-5B1E-4A05-9FDA-36625C12FC33}.Release|x64.Build.0 = Release|x64
-		{4529D741-5B1E-4A05-9FDA-36625C12FC33}.Sample Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4529D741-5B1E-4A05-9FDA-36625C12FC33}.Sample Release|Any CPU.Build.0 = Release|Any CPU
-		{4529D741-5B1E-4A05-9FDA-36625C12FC33}.Sample Release|iPhone.ActiveCfg = Release|Any CPU
-		{4529D741-5B1E-4A05-9FDA-36625C12FC33}.Sample Release|iPhone.Build.0 = Release|Any CPU
-		{4529D741-5B1E-4A05-9FDA-36625C12FC33}.Sample Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{4529D741-5B1E-4A05-9FDA-36625C12FC33}.Sample Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{4529D741-5B1E-4A05-9FDA-36625C12FC33}.Sample Release|x64.ActiveCfg = Release|x64
-		{4529D741-5B1E-4A05-9FDA-36625C12FC33}.Sample Release|x64.Build.0 = Release|x64
-		{5818A5AF-3FF6-4E68-80FC-604D4AEF156C}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{5818A5AF-3FF6-4E68-80FC-604D4AEF156C}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{5818A5AF-3FF6-4E68-80FC-604D4AEF156C}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{5818A5AF-3FF6-4E68-80FC-604D4AEF156C}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{5818A5AF-3FF6-4E68-80FC-604D4AEF156C}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{5818A5AF-3FF6-4E68-80FC-604D4AEF156C}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{5818A5AF-3FF6-4E68-80FC-604D4AEF156C}.Ad-Hoc|x64.ActiveCfg = Debug|x64
-		{5818A5AF-3FF6-4E68-80FC-604D4AEF156C}.Ad-Hoc|x64.Build.0 = Debug|x64
-		{5818A5AF-3FF6-4E68-80FC-604D4AEF156C}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{5818A5AF-3FF6-4E68-80FC-604D4AEF156C}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{5818A5AF-3FF6-4E68-80FC-604D4AEF156C}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{5818A5AF-3FF6-4E68-80FC-604D4AEF156C}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{5818A5AF-3FF6-4E68-80FC-604D4AEF156C}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{5818A5AF-3FF6-4E68-80FC-604D4AEF156C}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{5818A5AF-3FF6-4E68-80FC-604D4AEF156C}.AppStore|x64.ActiveCfg = Debug|x64
-		{5818A5AF-3FF6-4E68-80FC-604D4AEF156C}.AppStore|x64.Build.0 = Debug|x64
-		{5818A5AF-3FF6-4E68-80FC-604D4AEF156C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5818A5AF-3FF6-4E68-80FC-604D4AEF156C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5818A5AF-3FF6-4E68-80FC-604D4AEF156C}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{5818A5AF-3FF6-4E68-80FC-604D4AEF156C}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{5818A5AF-3FF6-4E68-80FC-604D4AEF156C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{5818A5AF-3FF6-4E68-80FC-604D4AEF156C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{5818A5AF-3FF6-4E68-80FC-604D4AEF156C}.Debug|x64.ActiveCfg = Debug|x64
-		{5818A5AF-3FF6-4E68-80FC-604D4AEF156C}.Debug|x64.Build.0 = Debug|x64
-		{5818A5AF-3FF6-4E68-80FC-604D4AEF156C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5818A5AF-3FF6-4E68-80FC-604D4AEF156C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5818A5AF-3FF6-4E68-80FC-604D4AEF156C}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{5818A5AF-3FF6-4E68-80FC-604D4AEF156C}.Release|iPhone.Build.0 = Release|Any CPU
-		{5818A5AF-3FF6-4E68-80FC-604D4AEF156C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{5818A5AF-3FF6-4E68-80FC-604D4AEF156C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{5818A5AF-3FF6-4E68-80FC-604D4AEF156C}.Release|x64.ActiveCfg = Release|x64
-		{5818A5AF-3FF6-4E68-80FC-604D4AEF156C}.Release|x64.Build.0 = Release|x64
-		{5818A5AF-3FF6-4E68-80FC-604D4AEF156C}.Sample Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5818A5AF-3FF6-4E68-80FC-604D4AEF156C}.Sample Release|Any CPU.Build.0 = Release|Any CPU
-		{5818A5AF-3FF6-4E68-80FC-604D4AEF156C}.Sample Release|iPhone.ActiveCfg = Release|Any CPU
-		{5818A5AF-3FF6-4E68-80FC-604D4AEF156C}.Sample Release|iPhone.Build.0 = Release|Any CPU
-		{5818A5AF-3FF6-4E68-80FC-604D4AEF156C}.Sample Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{5818A5AF-3FF6-4E68-80FC-604D4AEF156C}.Sample Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{5818A5AF-3FF6-4E68-80FC-604D4AEF156C}.Sample Release|x64.ActiveCfg = Release|x64
-		{5818A5AF-3FF6-4E68-80FC-604D4AEF156C}.Sample Release|x64.Build.0 = Release|x64
-		{B3804254-BA2D-4ECF-9A71-8685843A546F}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{B3804254-BA2D-4ECF-9A71-8685843A546F}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{B3804254-BA2D-4ECF-9A71-8685843A546F}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{B3804254-BA2D-4ECF-9A71-8685843A546F}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{B3804254-BA2D-4ECF-9A71-8685843A546F}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{B3804254-BA2D-4ECF-9A71-8685843A546F}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{B3804254-BA2D-4ECF-9A71-8685843A546F}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
-		{B3804254-BA2D-4ECF-9A71-8685843A546F}.Ad-Hoc|x64.Build.0 = Release|Any CPU
-		{B3804254-BA2D-4ECF-9A71-8685843A546F}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{B3804254-BA2D-4ECF-9A71-8685843A546F}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{B3804254-BA2D-4ECF-9A71-8685843A546F}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{B3804254-BA2D-4ECF-9A71-8685843A546F}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{B3804254-BA2D-4ECF-9A71-8685843A546F}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{B3804254-BA2D-4ECF-9A71-8685843A546F}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{B3804254-BA2D-4ECF-9A71-8685843A546F}.AppStore|x64.ActiveCfg = Release|Any CPU
-		{B3804254-BA2D-4ECF-9A71-8685843A546F}.AppStore|x64.Build.0 = Release|Any CPU
-		{B3804254-BA2D-4ECF-9A71-8685843A546F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B3804254-BA2D-4ECF-9A71-8685843A546F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B3804254-BA2D-4ECF-9A71-8685843A546F}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{B3804254-BA2D-4ECF-9A71-8685843A546F}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{B3804254-BA2D-4ECF-9A71-8685843A546F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{B3804254-BA2D-4ECF-9A71-8685843A546F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{B3804254-BA2D-4ECF-9A71-8685843A546F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B3804254-BA2D-4ECF-9A71-8685843A546F}.Debug|x64.Build.0 = Debug|Any CPU
-		{B3804254-BA2D-4ECF-9A71-8685843A546F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B3804254-BA2D-4ECF-9A71-8685843A546F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B3804254-BA2D-4ECF-9A71-8685843A546F}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{B3804254-BA2D-4ECF-9A71-8685843A546F}.Release|iPhone.Build.0 = Release|Any CPU
-		{B3804254-BA2D-4ECF-9A71-8685843A546F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{B3804254-BA2D-4ECF-9A71-8685843A546F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{B3804254-BA2D-4ECF-9A71-8685843A546F}.Release|x64.ActiveCfg = Release|Any CPU
-		{B3804254-BA2D-4ECF-9A71-8685843A546F}.Release|x64.Build.0 = Release|Any CPU
-		{B3804254-BA2D-4ECF-9A71-8685843A546F}.Sample Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B3804254-BA2D-4ECF-9A71-8685843A546F}.Sample Release|Any CPU.Build.0 = Release|Any CPU
-		{B3804254-BA2D-4ECF-9A71-8685843A546F}.Sample Release|iPhone.ActiveCfg = Release|Any CPU
-		{B3804254-BA2D-4ECF-9A71-8685843A546F}.Sample Release|iPhone.Build.0 = Release|Any CPU
-		{B3804254-BA2D-4ECF-9A71-8685843A546F}.Sample Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{B3804254-BA2D-4ECF-9A71-8685843A546F}.Sample Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{B3804254-BA2D-4ECF-9A71-8685843A546F}.Sample Release|x64.ActiveCfg = Release|Any CPU
-		{B3804254-BA2D-4ECF-9A71-8685843A546F}.Sample Release|x64.Build.0 = Release|Any CPU
-		{21A3E901-0F54-4970-B994-09F0574D42E0}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
-		{21A3E901-0F54-4970-B994-09F0574D42E0}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
-		{21A3E901-0F54-4970-B994-09F0574D42E0}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{21A3E901-0F54-4970-B994-09F0574D42E0}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{21A3E901-0F54-4970-B994-09F0574D42E0}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{21A3E901-0F54-4970-B994-09F0574D42E0}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{21A3E901-0F54-4970-B994-09F0574D42E0}.Ad-Hoc|x64.ActiveCfg = Debug|x64
-		{21A3E901-0F54-4970-B994-09F0574D42E0}.Ad-Hoc|x64.Build.0 = Debug|x64
-		{21A3E901-0F54-4970-B994-09F0574D42E0}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
-		{21A3E901-0F54-4970-B994-09F0574D42E0}.AppStore|Any CPU.Build.0 = Debug|Any CPU
-		{21A3E901-0F54-4970-B994-09F0574D42E0}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{21A3E901-0F54-4970-B994-09F0574D42E0}.AppStore|iPhone.Build.0 = Debug|Any CPU
-		{21A3E901-0F54-4970-B994-09F0574D42E0}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{21A3E901-0F54-4970-B994-09F0574D42E0}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{21A3E901-0F54-4970-B994-09F0574D42E0}.AppStore|x64.ActiveCfg = Debug|x64
-		{21A3E901-0F54-4970-B994-09F0574D42E0}.AppStore|x64.Build.0 = Debug|x64
-		{21A3E901-0F54-4970-B994-09F0574D42E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{21A3E901-0F54-4970-B994-09F0574D42E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{21A3E901-0F54-4970-B994-09F0574D42E0}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{21A3E901-0F54-4970-B994-09F0574D42E0}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{21A3E901-0F54-4970-B994-09F0574D42E0}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{21A3E901-0F54-4970-B994-09F0574D42E0}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{21A3E901-0F54-4970-B994-09F0574D42E0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{21A3E901-0F54-4970-B994-09F0574D42E0}.Debug|x64.Build.0 = Debug|Any CPU
-		{21A3E901-0F54-4970-B994-09F0574D42E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{21A3E901-0F54-4970-B994-09F0574D42E0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{21A3E901-0F54-4970-B994-09F0574D42E0}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{21A3E901-0F54-4970-B994-09F0574D42E0}.Release|iPhone.Build.0 = Release|Any CPU
-		{21A3E901-0F54-4970-B994-09F0574D42E0}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{21A3E901-0F54-4970-B994-09F0574D42E0}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{21A3E901-0F54-4970-B994-09F0574D42E0}.Release|x64.ActiveCfg = Release|x64
-		{21A3E901-0F54-4970-B994-09F0574D42E0}.Release|x64.Build.0 = Release|x64
-		{21A3E901-0F54-4970-B994-09F0574D42E0}.Sample Release|Any CPU.ActiveCfg = Release|Any CPU
-		{21A3E901-0F54-4970-B994-09F0574D42E0}.Sample Release|Any CPU.Build.0 = Release|Any CPU
-		{21A3E901-0F54-4970-B994-09F0574D42E0}.Sample Release|iPhone.ActiveCfg = Release|Any CPU
-		{21A3E901-0F54-4970-B994-09F0574D42E0}.Sample Release|iPhone.Build.0 = Release|Any CPU
-		{21A3E901-0F54-4970-B994-09F0574D42E0}.Sample Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{21A3E901-0F54-4970-B994-09F0574D42E0}.Sample Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{21A3E901-0F54-4970-B994-09F0574D42E0}.Sample Release|x64.ActiveCfg = Release|x64
-		{21A3E901-0F54-4970-B994-09F0574D42E0}.Sample Release|x64.Build.0 = Release|x64
+		{0A65FB55-9845-3253-1E62-54F5ECF8EC45}.Debug|x64.Deploy.0 = Debug|x64
+		{23FAD9AC-3228-B931-96D7-313C66385B72}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{23FAD9AC-3228-B931-96D7-313C66385B72}.Debug|x64.Build.0 = Debug|Any CPU
+		{23FAD9AC-3228-B931-96D7-313C66385B72}.Release|x64.ActiveCfg = Release|Any CPU
+		{23FAD9AC-3228-B931-96D7-313C66385B72}.Release|x64.Build.0 = Release|Any CPU
+		{731C35C8-C3BB-2867-88CA-EF67291B98AC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{731C35C8-C3BB-2867-88CA-EF67291B98AC}.Debug|x64.Build.0 = Debug|Any CPU
+		{731C35C8-C3BB-2867-88CA-EF67291B98AC}.Release|x64.ActiveCfg = Release|Any CPU
+		{731C35C8-C3BB-2867-88CA-EF67291B98AC}.Release|x64.Build.0 = Release|Any CPU
+		{0A65FB55-9845-3253-1E62-54F5ECF8EC45}.Debug|x64.ActiveCfg = Debug|x64
+		{0A65FB55-9845-3253-1E62-54F5ECF8EC45}.Debug|x64.Build.0 = Debug|x64
+		{0A65FB55-9845-3253-1E62-54F5ECF8EC45}.Release|x64.ActiveCfg = Release|x64
+		{0A65FB55-9845-3253-1E62-54F5ECF8EC45}.Release|x64.Build.0 = Release|x64
+		{8F56EB4C-63F9-C156-A8CE-0BC8C8DA73E1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8F56EB4C-63F9-C156-A8CE-0BC8C8DA73E1}.Debug|x64.Build.0 = Debug|Any CPU
+		{8F56EB4C-63F9-C156-A8CE-0BC8C8DA73E1}.Release|x64.ActiveCfg = Release|Any CPU
+		{8F56EB4C-63F9-C156-A8CE-0BC8C8DA73E1}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{4CF5E8D0-BB2C-4790-9AD5-03AEC069C3C3} = {637F2480-8306-4A3C-8E97-CB12D5FC3676}
-		{4529D741-5B1E-4A05-9FDA-36625C12FC33} = {637F2480-8306-4A3C-8E97-CB12D5FC3676}
-		{21A3E901-0F54-4970-B994-09F0574D42E0} = {637F2480-8306-4A3C-8E97-CB12D5FC3676}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {F9AB7F21-AD32-47C9-A787-767DD85B40CB}
+		{23FAD9AC-3228-B931-96D7-313C66385B72} = {6C4D298B-81FB-2B6B-5AB6-46205EDDC72C}
+		{731C35C8-C3BB-2867-88CA-EF67291B98AC} = {6C4D298B-81FB-2B6B-5AB6-46205EDDC72C}
 	EndGlobalSection
 EndGlobal
diff --git a/src/Sample/SextantSample/App.xaml b/src/Sample/SextantSample/App.xaml
deleted file mode 100644
index 98afee93..00000000
--- a/src/Sample/SextantSample/App.xaml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Application xmlns="http://xamarin.com/schemas/2014/forms" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" x:Class="SextantSample.App">
-    <Application.Resources>
-    </Application.Resources>
-</Application>
\ No newline at end of file
diff --git a/src/Sample/SextantSample/App.xaml.cs b/src/Sample/SextantSample/App.xaml.cs
deleted file mode 100644
index 628fb2c3..00000000
--- a/src/Sample/SextantSample/App.xaml.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for full license information.
-
-using System;
-using ReactiveUI;
-using Sextant;
-using Sextant.XamForms;
-using SextantSample.ViewModels;
-using SextantSample.Views;
-using Splat;
-using Xamarin.Forms.Xaml;
-using static Sextant.Sextant;
-
-[assembly: XamlCompilation(XamlCompilationOptions.Compile)]
-
-namespace SextantSample;
-
-/// <summary>
-/// App.
-/// </summary>
-/// <seealso cref="Xamarin.Forms.Application" />
-public partial class App
-{
-    /// <summary>
-    /// Initializes a new instance of the <see cref="App"/> class.
-    /// </summary>
-    public App()
-    {
-        InitializeComponent();
-
-        RxApp.DefaultExceptionHandler = new SextantDefaultExceptionHandler();
-        Instance.InitializeForms();
-        Locator
-            .CurrentMutable
-            .RegisterView<HomeView, HomeViewModel>()
-            .RegisterView<FirstModalView, FirstModalViewModel>()
-            .RegisterView<SecondModalView, SecondModalViewModel>()
-            .RegisterView<RedView, RedViewModel>()
-            .RegisterView<GreenView, GreenViewModel>()
-            .RegisterNavigationView(() => new BlueNavigationView())
-            .RegisterViewModel(() => new GreenViewModel(Locator.Current.GetService<IViewStackService>()));
-
-        Locator
-            .Current
-            .GetService<IViewStackService>()
-            .PushPage(new HomeViewModel(), null, true, false)
-            .Subscribe();
-
-        MainPage = Locator.Current.GetNavigationView();
-    }
-
-    /// <summary>
-    /// Application developers override this method to perform actions when the application starts.
-    /// </summary>
-    /// <remarks>
-    /// To be added.
-    /// </remarks>
-    protected override void OnStart()
-    {
-        // Handle when your app starts
-    }
-
-    /// <summary>
-    /// Application developers override this method to perform actions when the application enters the sleeping state.
-    /// </summary>
-    /// <remarks>
-    /// To be added.
-    /// </remarks>
-    protected override void OnSleep()
-    {
-        // Handle when your app sleeps
-    }
-
-    /// <summary>
-    /// Application developers override this method to perform actions when the application resumes from a sleeping state.
-    /// </summary>
-    /// <remarks>
-    /// To be added.
-    /// </remarks>
-    protected override void OnResume()
-    {
-        // Handle when your app resumes
-    }
-}
diff --git a/src/Sample/SextantSample/SextantSample.csproj b/src/Sample/SextantSample/SextantSample.csproj
deleted file mode 100644
index 859b3dd6..00000000
--- a/src/Sample/SextantSample/SextantSample.csproj
+++ /dev/null
@@ -1,20 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <Platforms>AnyCPU;x64</Platforms>
-    <LangVersion>preview</LangVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="System.Collections.Immutable" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Remove="MainPage.xaml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Remove="Views\FirstModalNavigationView.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Sextant.XamForms\Sextant.XamForms.csproj" />
-    <ProjectReference Include="..\SextantSample.Core\SextantSample.ViewModels.csproj" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/Sample/SextantSample/Views/BlueNavigationView.cs b/src/Sample/SextantSample/Views/BlueNavigationView.cs
deleted file mode 100644
index 6e1db4e2..00000000
--- a/src/Sample/SextantSample/Views/BlueNavigationView.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for full license information.
-
-using System;
-
-using ReactiveUI;
-
-using Sextant.XamForms;
-using Xamarin.Forms;
-
-namespace SextantSample.Views;
-
-/// <summary>
-/// BlueNavigationView.
-/// </summary>
-/// <seealso cref="Sextant.XamForms.NavigationView" />
-/// <seealso cref="ReactiveUI.IViewFor" />
-public class BlueNavigationView : NavigationView, IViewFor
-{
-    /// <summary>
-    /// Initializes a new instance of the <see cref="BlueNavigationView"/> class.
-    /// </summary>
-    public BlueNavigationView()
-        : base(RxApp.MainThreadScheduler, RxApp.TaskpoolScheduler, ViewLocator.Current)
-    {
-        BarBackgroundColor = Color.Blue;
-        BarTextColor = Color.White;
-    }
-
-    /// <summary>
-    /// Gets or sets the View Model associated with the View.
-    /// </summary>
-#pragma warning disable CA1065 // Do not raise exceptions in unexpected locations
-    public object ViewModel { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
-#pragma warning restore CA1065 // Do not raise exceptions in unexpected locations
-}
diff --git a/src/Sample/SextantSample/Views/FirstModalView.xaml b/src/Sample/SextantSample/Views/FirstModalView.xaml
deleted file mode 100644
index 679e6a1f..00000000
--- a/src/Sample/SextantSample/Views/FirstModalView.xaml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rxui:ReactiveContentPage xmlns="http://xamarin.com/schemas/2014/forms"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:rxui="clr-namespace:ReactiveUI.XamForms;assembly=ReactiveUI.XamForms"
-             xmlns:viewModels="clr-namespace:SextantSample.ViewModels;assembly=SextantSample.ViewModels"
-             x:TypeArguments="viewModels:FirstModalViewModel"
-             x:Class="SextantSample.Views.FirstModalView"
-             Title="First Modal">
-    <ContentPage.Content>
-        <StackLayout>
-        <Button x:Name="OpenSecondModal" Text="Second Modal" />
-        <Button x:Name="PopModal" Text="Pop Modal" />
-        </StackLayout>
-    </ContentPage.Content>
-</rxui:ReactiveContentPage>
diff --git a/src/Sample/SextantSample/Views/FirstModalView.xaml.cs b/src/Sample/SextantSample/Views/FirstModalView.xaml.cs
deleted file mode 100644
index 8f703000..00000000
--- a/src/Sample/SextantSample/Views/FirstModalView.xaml.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for full license information.
-
-using ReactiveUI;
-
-using SextantSample.ViewModels;
-
-namespace SextantSample.Views;
-
-/// <summary>
-/// FirstModalView.
-/// </summary>
-public partial class FirstModalView
-{
-    /// <summary>
-    /// Initializes a new instance of the <see cref="FirstModalView"/> class.
-    /// </summary>
-    public FirstModalView()
-    {
-        InitializeComponent();
-        this.BindCommand(ViewModel, x => x.OpenModal, x => x.OpenSecondModal);
-        this.BindCommand(ViewModel, x => x.PopModal, x => x.PopModal);
-
-        Interactions
-            .ErrorMessage
-            .RegisterHandler(async x =>
-            {
-                await DisplayAlert("Error", x.Input.Message, "Done");
-                x.SetOutput(true);
-            });
-    }
-}
diff --git a/src/Sample/SextantSample/Views/GreenView.xaml b/src/Sample/SextantSample/Views/GreenView.xaml
deleted file mode 100644
index 0798aaab..00000000
--- a/src/Sample/SextantSample/Views/GreenView.xaml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<xamForms:ReactiveContentPage xmlns="http://xamarin.com/schemas/2014/forms"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:xamForms="clr-namespace:ReactiveUI.XamForms;assembly=ReactiveUI.XamForms"
-             xmlns:viewModels="clr-namespace:SextantSample.ViewModels;assembly=SextantSample.ViewModels"
-             x:TypeArguments="viewModels:GreenViewModel"
-             x:Class="SextantSample.Views.GreenView">
-    <ContentPage.Content>
-        <StackLayout BackgroundColor="#043927">
-            <Button x:Name="Modal" Text="Open Modal" />
-        </StackLayout>
-    </ContentPage.Content>
-</xamForms:ReactiveContentPage>
-
diff --git a/src/Sample/SextantSample/Views/GreenView.xaml.cs b/src/Sample/SextantSample/Views/GreenView.xaml.cs
deleted file mode 100644
index 5ce35b14..00000000
--- a/src/Sample/SextantSample/Views/GreenView.xaml.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for full license information.
-
-using ReactiveUI;
-using ReactiveUI.XamForms;
-
-using SextantSample.ViewModels;
-using Xamarin.Forms.Xaml;
-
-namespace SextantSample.Views;
-
-/// <summary>
-/// GreenView.
-/// </summary>
-[XamlCompilation(XamlCompilationOptions.Compile)]
-public partial class GreenView : ReactiveContentPage<GreenViewModel>
-{
-    /// <summary>
-    /// Initializes a new instance of the <see cref="GreenView"/> class.
-    /// </summary>
-    public GreenView()
-    {
-        InitializeComponent();
-
-        this.BindCommand(ViewModel, x => x.OpenModal, x => x.Modal);
-    }
-}
diff --git a/src/Sample/SextantSample/Views/HomeView.xaml b/src/Sample/SextantSample/Views/HomeView.xaml
deleted file mode 100644
index a5af1dcb..00000000
--- a/src/Sample/SextantSample/Views/HomeView.xaml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rxui:ReactiveContentPage xmlns="http://xamarin.com/schemas/2014/forms"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:rxui="clr-namespace:ReactiveUI.XamForms;assembly=ReactiveUI.XamForms"
-             xmlns:viewModels="clr-namespace:SextantSample.ViewModels;assembly=SextantSample.ViewModels"
-             x:TypeArguments="viewModels:HomeViewModel"
-             x:Class="SextantSample.Views.HomeView"
-             Title="Home">
-    <ContentPage.Content>
-        <StackLayout>
-            <Button x:Name="FirstModalButton" Text="First Modal" />
-            <Button x:Name="PushPage" Text="Push Red Page" />
-            <Button x:Name="PushGenericPage" Text="Push Green Page" />
-        </StackLayout>
-    </ContentPage.Content>
-</rxui:ReactiveContentPage>
diff --git a/src/Sample/SextantSample/Views/HomeView.xaml.cs b/src/Sample/SextantSample/Views/HomeView.xaml.cs
deleted file mode 100644
index d16216f6..00000000
--- a/src/Sample/SextantSample/Views/HomeView.xaml.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for full license information.
-
-using System.Reactive.Disposables;
-
-using ReactiveUI;
-
-using SextantSample.ViewModels;
-
-namespace SextantSample.Views;
-
-/// <summary>
-/// HomeView.
-/// </summary>
-public partial class HomeView
-{
-    /// <summary>
-    /// Initializes a new instance of the <see cref="HomeView"/> class.
-    /// </summary>
-    public HomeView()
-    {
-        InitializeComponent();
-
-        this.WhenActivated(disposables =>
-    {
-        this.BindCommand(ViewModel, x => x.OpenModal, x => x.FirstModalButton).DisposeWith(disposables);
-        this.BindCommand(ViewModel, x => x.PushPage, x => x.PushPage).DisposeWith(disposables);
-        this.BindCommand(ViewModel, x => x.PushGenericPage, x => x.PushGenericPage).DisposeWith(disposables);
-    });
-
-        Interactions
-            .ErrorMessage
-            .RegisterHandler(async x =>
-            {
-                await DisplayAlert("Error", x.Input.Message, "Done");
-                x.SetOutput(true);
-            });
-    }
-}
diff --git a/src/Sample/SextantSample/Views/RedView.xaml b/src/Sample/SextantSample/Views/RedView.xaml
deleted file mode 100644
index 490f4426..00000000
--- a/src/Sample/SextantSample/Views/RedView.xaml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rxui:ReactiveContentPage xmlns="http://xamarin.com/schemas/2014/forms"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:rxui="clr-namespace:ReactiveUI.XamForms;assembly=ReactiveUI.XamForms"
-             xmlns:viewModels="clr-namespace:SextantSample.ViewModels;assembly=SextantSample.ViewModels"
-             x:TypeArguments="viewModels:RedViewModel"
-             x:Class="SextantSample.Views.RedView"
-             Title="First Modal">
-    <ContentPage.Content>
-        <StackLayout BackgroundColor="Red">
-            <Button x:Name="PopModal" Text="Pop Modal" TextColor="White"/>
-            <Button x:Name="PushPage" Text="Push Another Red Page" TextColor="White"/>
-            <Button x:Name="PopPage" Text="Pop Page" TextColor="White"/>
-            <Button x:Name="PopToRoot" Text="Pop To Root" TextColor="White"/>
-        </StackLayout>
-    </ContentPage.Content>
-</rxui:ReactiveContentPage>
diff --git a/src/Sample/SextantSample/Views/RedView.xaml.cs b/src/Sample/SextantSample/Views/RedView.xaml.cs
deleted file mode 100644
index 5be989e7..00000000
--- a/src/Sample/SextantSample/Views/RedView.xaml.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for full license information.
-
-using ReactiveUI;
-using ReactiveUI.XamForms;
-using SextantSample.ViewModels;
-
-namespace SextantSample.Views;
-
-/// <summary>
-/// RedView.
-/// </summary>
-public partial class RedView
-{
-    /// <summary>
-    /// Initializes a new instance of the <see cref="RedView"/> class.
-    /// </summary>
-    public RedView()
-    {
-        InitializeComponent();
-        this.BindCommand(ViewModel, x => x.PopModal, x => x.PopModal);
-        this.BindCommand(ViewModel, x => x.PushPage, x => x.PushPage);
-        this.BindCommand(ViewModel, x => x.PopPage, x => x.PopPage);
-        this.BindCommand(ViewModel, x => x.PopToRoot, x => x.PopToRoot);
-
-        Interactions
-            .ErrorMessage
-            .RegisterHandler(async x =>
-            {
-                await DisplayAlert("Error", x.Input.Message, "Done");
-                x.SetOutput(true);
-            });
-    }
-}
diff --git a/src/Sample/SextantSample/Views/SecondModalView.xaml b/src/Sample/SextantSample/Views/SecondModalView.xaml
deleted file mode 100644
index 4761a0d2..00000000
--- a/src/Sample/SextantSample/Views/SecondModalView.xaml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rxui:ReactiveContentPage xmlns="http://xamarin.com/schemas/2014/forms"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:rxui="clr-namespace:ReactiveUI.XamForms;assembly=ReactiveUI.XamForms"
-             xmlns:viewModels="clr-namespace:SextantSample.ViewModels;assembly=SextantSample.ViewModels"
-             x:TypeArguments="viewModels:SecondModalViewModel"
-             x:Class="SextantSample.Views.SecondModalView"
-             Title="Second Modal">
-    <ContentPage.Content>
-        <StackLayout>
-        <Button x:Name="PushPage" Text="Push Page" />
-        <Button x:Name="PopModal" Text="Pop Modal" />
-        </StackLayout>
-    </ContentPage.Content>
-</rxui:ReactiveContentPage>
diff --git a/src/Sample/SextantSample/Views/SecondModalView.xaml.cs b/src/Sample/SextantSample/Views/SecondModalView.xaml.cs
deleted file mode 100644
index 9ff4aad7..00000000
--- a/src/Sample/SextantSample/Views/SecondModalView.xaml.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for full license information.
-
-using ReactiveUI;
-using SextantSample.ViewModels;
-
-namespace SextantSample.Views;
-
-/// <summary>
-/// SecondModalView.
-/// </summary>
-public partial class SecondModalView
-{
-    /// <summary>
-    /// Initializes a new instance of the <see cref="SecondModalView"/> class.
-    /// </summary>
-    public SecondModalView()
-    {
-        InitializeComponent();
-        this.BindCommand(ViewModel, x => x.PushPage, x => x.PushPage);
-        this.BindCommand(ViewModel, x => x.PopModal, x => x.PopModal);
-
-        Interactions
-            .ErrorMessage
-            .RegisterHandler(async x =>
-            {
-                await DisplayAlert("Error", x.Input.Message, "Done");
-                x.SetOutput(true);
-            });
-    }
-}
diff --git a/src/Sextant.Avalonia/DependencyResolverMixins.cs b/src/Sextant.Avalonia/DependencyResolverMixins.cs
index fccb231e..ded4346b 100644
--- a/src/Sextant.Avalonia/DependencyResolverMixins.cs
+++ b/src/Sextant.Avalonia/DependencyResolverMixins.cs
@@ -26,6 +26,11 @@ public static IMutableDependencyResolver RegisterNavigationView<TView>(
             Func<TView> navigationViewFactory)
             where TView : IView
         {
+            if (navigationViewFactory == null)
+            {
+                throw new ArgumentNullException(nameof(navigationViewFactory));
+            }
+
             var navigationView = navigationViewFactory();
             var viewStackService = new ViewStackService(navigationView);
             dependencyResolver.RegisterLazySingleton<IViewStackService>(() => viewStackService);
diff --git a/src/Sextant.Avalonia/NavigationView.cs b/src/Sextant.Avalonia/NavigationView.cs
index d11b9837..49442cb4 100644
--- a/src/Sextant.Avalonia/NavigationView.cs
+++ b/src/Sextant.Avalonia/NavigationView.cs
@@ -94,6 +94,11 @@ public IObservable<Unit> PushPage(
             bool resetStack,
             bool animate = true)
         {
+            if (viewModel == null)
+            {
+                throw new ArgumentNullException(nameof(viewModel));
+            }
+
             var view = LocateView(viewModel, contract);
             _pageNavigation.ToggleAnimations(!_modalNavigation.IsVisible);
             _pageNavigation.Push(view, resetStack);
@@ -122,6 +127,11 @@ public IObservable<Unit> PushModal(
             string? contract,
             bool withNavigationPage = true)
         {
+            if (modalViewModel == null)
+            {
+                throw new ArgumentNullException(nameof(modalViewModel));
+            }
+
             var view = LocateView(modalViewModel, contract);
             _modalNavigation.Push(view);
             return Observable.Return(Unit.Default);
diff --git a/src/Sextant.Avalonia/Sextant.Avalonia.csproj b/src/Sextant.Avalonia/Sextant.Avalonia.csproj
index 7e23962b..1e038b4b 100644
--- a/src/Sextant.Avalonia/Sextant.Avalonia.csproj
+++ b/src/Sextant.Avalonia/Sextant.Avalonia.csproj
@@ -1,11 +1,7 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
-    <AssemblyName>Sextant.Avalonia</AssemblyName>
+    <TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
     <RootNamespace>Sextant.Avalonia</RootNamespace>
-    <PackageId>Sextant.Avalonia</PackageId>
-    <Nullable>enable</Nullable>
-    <LangVersion>preview</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="ReactiveUI" />
diff --git a/src/Sextant.Maui/NavigationView.cs b/src/Sextant.Maui/NavigationView.cs
index 9c677b29..e6749669 100644
--- a/src/Sextant.Maui/NavigationView.cs
+++ b/src/Sextant.Maui/NavigationView.cs
@@ -195,7 +195,7 @@ public IObservable<Unit> PushPage(
                         .ToObservable();
                 });
 
-    private static void SetPageTitle(Page page, string resourceKey) =>
+    private static void SetPageTitle(Page page, string? resourceKey) =>
 
         // var title = Localize.GetString(resourceKey);
         // TODO: ensure resourceKey isn't null and is localized.
diff --git a/src/Sextant.Maui/Sextant.Maui.csproj b/src/Sextant.Maui/Sextant.Maui.csproj
index 7796d1ed..0746fc50 100644
--- a/src/Sextant.Maui/Sextant.Maui.csproj
+++ b/src/Sextant.Maui/Sextant.Maui.csproj
@@ -1,26 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
-    <AssemblyName>Sextant.Maui</AssemblyName>
-    <RootNamespace>Sextant.Maui</RootNamespace>
-    <PackageId>Sextant.Maui</PackageId>
-    <Nullable>enable</Nullable>
-    <LangVersion>latest</LangVersion>
     <UseMaui>true</UseMaui>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="ReactiveUI.Maui" />
   </ItemGroup>
-  <ItemGroup Condition="$(TargetFramework.StartsWith('net8'))">
-    <PackageReference Include="Microsoft.Maui.Controls" />
-    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Sextant\Sextant.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Mixins\" />
-    <Folder Include="Behaviors\" />
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Sextant.Mocks/Sextant.Mocks.csproj b/src/Sextant.Mocks/Sextant.Mocks.csproj
index bb4aee02..783da394 100644
--- a/src/Sextant.Mocks/Sextant.Mocks.csproj
+++ b/src/Sextant.Mocks/Sextant.Mocks.csproj
@@ -1,11 +1,9 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
     <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net462;</TargetFrameworks>
     <IsPackable>false</IsPackable>
-    <Nullable>enable</Nullable>
-    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Sextant.Plugins.Popup/IPopupViewStackService.cs b/src/Sextant.Plugins.Popup/IPopupViewStackService.cs
index 0e5ccb96..380a8506 100644
--- a/src/Sextant.Plugins.Popup/IPopupViewStackService.cs
+++ b/src/Sextant.Plugins.Popup/IPopupViewStackService.cs
@@ -6,100 +6,100 @@
 using System;
 using System.Collections.Generic;
 using System.Reactive;
+using Mopups.Interfaces;
 
-namespace Sextant.Plugins.Popup
+namespace Sextant.Plugins.Popup;
+
+/// <summary>
+/// Interface representing a Sextant decorator for <see cref="IPopupNavigation"/>.
+/// </summary>
+public interface IPopupViewStackService : IParameterViewStackService
 {
     /// <summary>
-    /// Interface representing a Sextant decorator for <see cref="Rg.Plugins.Popup.Contracts.IPopupNavigation"/>.
+    /// Gets an observable sequence of pushing events.
     /// </summary>
-    public interface IPopupViewStackService : IParameterViewStackService
-    {
-        /// <summary>
-        /// Gets an observable sequence of pushing events.
-        /// </summary>
-        IObservable<PopupNavigationEvent> Pushing { get; }
+    IObservable<PopupNavigationEvent> Pushing { get; }
 
-        /// <summary>
-        /// Gets an observable sequence of pushed events.
-        /// </summary>
-        IObservable<PopupNavigationEvent> Pushed { get; }
+    /// <summary>
+    /// Gets an observable sequence of pushed events.
+    /// </summary>
+    IObservable<PopupNavigationEvent> Pushed { get; }
 
-        /// <summary>
-        /// Gets an observable sequence of popping events.
-        /// </summary>
-        IObservable<PopupNavigationEvent> Popping { get; }
+    /// <summary>
+    /// Gets an observable sequence of popping events.
+    /// </summary>
+    IObservable<PopupNavigationEvent> Popping { get; }
 
-        /// <summary>
-        /// Gets an observable sequence of popped events.
-        /// </summary>
-        IObservable<PopupNavigationEvent> Popped { get; }
+    /// <summary>
+    /// Gets an observable sequence of popped events.
+    /// </summary>
+    IObservable<PopupNavigationEvent> Popped { get; }
 
-        /// <summary>
-        /// Gets the popup stack.
-        /// </summary>
-        IReadOnlyList<IViewModel> PopupStack { get; }
+    /// <summary>
+    /// Gets the popup stack.
+    /// </summary>
+    IReadOnlyList<IViewModel> PopupStack { get; }
 
-        /// <summary>
-        /// Push a pop up page to the stack.
-        /// </summary>
-        /// <param name="viewModel">The view model.</param>
-        /// <param name="contract">The contract.</param>
-        /// <param name="animate">Animate the page.</param>
-        /// <returns>A completion notification.</returns>
-        IObservable<Unit> PushPopup(IViewModel viewModel, string? contract = null, bool animate = true);
+    /// <summary>
+    /// Push a pop up page to the stack.
+    /// </summary>
+    /// <param name="viewModel">The view model.</param>
+    /// <param name="contract">The contract.</param>
+    /// <param name="animate">Animate the page.</param>
+    /// <returns>A completion notification.</returns>
+    IObservable<Unit> PushPopup(IViewModel viewModel, string? contract = null, bool animate = true);
 
-        /// <summary>
-        /// Push a pop up page to the stack.
-        /// </summary>
-        /// <param name="contract">The contract.</param>
-        /// <param name="animate">Animate the page.</param>
-        /// <typeparam name="TViewModel">The view model type.</typeparam>
-        /// <returns>A completion notification.</returns>
-        IObservable<Unit> PushPopup<TViewModel>(string? contract = null, bool animate = true)
-            where TViewModel : IViewModel;
+    /// <summary>
+    /// Push a pop up page to the stack.
+    /// </summary>
+    /// <param name="contract">The contract.</param>
+    /// <param name="animate">Animate the page.</param>
+    /// <typeparam name="TViewModel">The view model type.</typeparam>
+    /// <returns>A completion notification.</returns>
+    IObservable<Unit> PushPopup<TViewModel>(string? contract = null, bool animate = true)
+        where TViewModel : IViewModel;
 
-        /// <summary>
-        /// Push a pop up page to the stack.
-        /// </summary>
-        /// <param name="viewModel">The view model.</param>
-        /// <param name="navigationParameter">The navigation parameter.</param>
-        /// <param name="contract">The contract.</param>
-        /// <param name="animate">Animate the page.</param>
-        /// <returns>A completion notification.</returns>
-        IObservable<Unit> PushPopup(INavigable viewModel, INavigationParameter navigationParameter, string? contract = null, bool animate = true);
+    /// <summary>
+    /// Push a pop up page to the stack.
+    /// </summary>
+    /// <param name="viewModel">The view model.</param>
+    /// <param name="navigationParameter">The navigation parameter.</param>
+    /// <param name="contract">The contract.</param>
+    /// <param name="animate">Animate the page.</param>
+    /// <returns>A completion notification.</returns>
+    IObservable<Unit> PushPopup(INavigable viewModel, INavigationParameter navigationParameter, string? contract = null, bool animate = true);
 
-        /// <summary>
-        /// Push a pop up page to the stack.
-        /// </summary>
-        /// <param name="navigationParameter">The navigation parameter.</param>
-        /// <param name="contract">The contract.</param>
-        /// <param name="animate">Animate the page.</param>
-        /// <typeparam name="TViewModel">The view model type.</typeparam>
-        /// <returns>A completion notification.</returns>
-        IObservable<Unit> PushPopup<TViewModel>(INavigationParameter navigationParameter, string? contract = null, bool animate = true)
-            where TViewModel : INavigable;
+    /// <summary>
+    /// Push a pop up page to the stack.
+    /// </summary>
+    /// <param name="navigationParameter">The navigation parameter.</param>
+    /// <param name="contract">The contract.</param>
+    /// <param name="animate">Animate the page.</param>
+    /// <typeparam name="TViewModel">The view model type.</typeparam>
+    /// <returns>A completion notification.</returns>
+    IObservable<Unit> PushPopup<TViewModel>(INavigationParameter navigationParameter, string? contract = null, bool animate = true)
+        where TViewModel : INavigable;
 
-        /// <summary>
-        /// Pop a pop up page.
-        /// </summary>
-        /// <param name="animate">Animate the page.</param>
-        /// <returns>A completion notification.</returns>
-        IObservable<Unit> PopPopup(bool animate = true);
+    /// <summary>
+    /// Pop a pop up page.
+    /// </summary>
+    /// <param name="animate">Animate the page.</param>
+    /// <returns>A completion notification.</returns>
+    IObservable<Unit> PopPopup(bool animate = true);
 
-        /// <summary>
-        /// Pop all popups from the stack.
-        /// </summary>
-        /// <param name="animate">Animate the page.</param>
-        /// <returns>A completion notification.</returns>
-        IObservable<Unit> PopAllPopups(bool animate = true);
+    /// <summary>
+    /// Pop all popups from the stack.
+    /// </summary>
+    /// <param name="animate">Animate the page.</param>
+    /// <returns>A completion notification.</returns>
+    IObservable<Unit> PopAllPopups(bool animate = true);
 
-        /// <summary>
-        /// Remove Popup.
-        /// </summary>
-        /// <param name="viewModel">The view model.</param>
-        /// <param name="contract">The contract.</param>
-        /// <param name="animate">Animate the page.</param>
-        /// <returns>A completion notification.</returns>
-        IObservable<Unit> RemovePopup(IViewModel viewModel, string? contract = null, bool animate = true);
-    }
+    /// <summary>
+    /// Remove Popup.
+    /// </summary>
+    /// <param name="viewModel">The view model.</param>
+    /// <param name="contract">The contract.</param>
+    /// <param name="animate">Animate the page.</param>
+    /// <returns>A completion notification.</returns>
+    IObservable<Unit> RemovePopup(IViewModel viewModel, string? contract = null, bool animate = true);
 }
diff --git a/src/Sextant.Plugins.Popup/PopupNavigationEvent.cs b/src/Sextant.Plugins.Popup/PopupNavigationEvent.cs
index 2ae9affb..7c031b46 100644
--- a/src/Sextant.Plugins.Popup/PopupNavigationEvent.cs
+++ b/src/Sextant.Plugins.Popup/PopupNavigationEvent.cs
@@ -6,42 +6,38 @@
 using System;
 using ReactiveUI;
 
-namespace Sextant.Plugins.Popup
+namespace Sextant.Plugins.Popup;
+
+/// <summary>
+/// Represents a popup navigation event.
+/// </summary>
+public class PopupNavigationEvent
 {
     /// <summary>
-    /// Represents a popup navigation event.
+    /// Initializes a new instance of the <see cref="PopupNavigationEvent"/> class.
     /// </summary>
-    public class PopupNavigationEvent
+    /// <param name="page">The view model.</param>
+    /// <param name="isAnimated">Is the page animated.</param>
+    public PopupNavigationEvent(IViewFor page, bool isAnimated)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PopupNavigationEvent"/> class.
-        /// </summary>
-        /// <param name="page">The view model.</param>
-        /// <param name="isAnimated">Is the page animated.</param>
-        public PopupNavigationEvent(IViewFor page, bool isAnimated)
-        {
-            if (page is null)
-            {
-                throw new ArgumentNullException(nameof(page));
-            }
-
-            if (page.ViewModel is null)
-            {
-                throw new InvalidOperationException($"{nameof(page.ViewModel)} cannot be null.");
-            }
+        ArgumentNullException.ThrowIfNull(page);
 
-            ViewModel = (IViewModel)page.ViewModel;
-            IsAnimated = isAnimated;
+        if (page.ViewModel is null)
+        {
+            throw new InvalidOperationException($"{nameof(page.ViewModel)} cannot be null.");
         }
 
-        /// <summary>
-        /// Gets the view model for the event.
-        /// </summary>
-        public IViewModel ViewModel { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether the page is animated.
-        /// </summary>
-        public bool IsAnimated { get; }
+        ViewModel = (IViewModel)page.ViewModel;
+        IsAnimated = isAnimated;
     }
+
+    /// <summary>
+    /// Gets the view model for the event.
+    /// </summary>
+    public IViewModel ViewModel { get; }
+
+    /// <summary>
+    /// Gets a value indicating whether the page is animated.
+    /// </summary>
+    public bool IsAnimated { get; }
 }
diff --git a/src/Sextant.Plugins.Popup/PopupViewStackService.cs b/src/Sextant.Plugins.Popup/PopupViewStackService.cs
index f20504a6..7f1ecae4 100644
--- a/src/Sextant.Plugins.Popup/PopupViewStackService.cs
+++ b/src/Sextant.Plugins.Popup/PopupViewStackService.cs
@@ -3,23 +3,20 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
+using Mopups.Interfaces;
 using ReactiveUI;
-using Rg.Plugins.Popup.Contracts;
 
-namespace Sextant.Plugins.Popup
-{
-    /// <summary>
-    /// Abstract base class for view stack services.
-    /// </summary>
-    /// <remarks>
-    /// Initializes a new instance of the <see cref="PopupViewStackService"/> class.
-    /// </remarks>
-    /// <param name="view">The view.</param>
-    /// <param name="popupNavigation">The popup navigation.</param>
-    /// <param name="viewLocator">The view locator.</param>
-    /// <param name="viewModelFactory">The view model factory.</param>
-    public sealed class PopupViewStackService(IView view, IPopupNavigation popupNavigation, IViewLocator viewLocator, IViewModelFactory viewModelFactory)
-        : PopupViewStackServiceBase(view, popupNavigation, viewLocator, viewModelFactory)
-    {
-    }
-}
+namespace Sextant.Plugins.Popup;
+
+/// <summary>
+/// Abstract base class for view stack services.
+/// </summary>
+/// <remarks>
+/// Initializes a new instance of the <see cref="PopupViewStackService"/> class.
+/// </remarks>
+/// <param name="view">The view.</param>
+/// <param name="popupNavigation">The popup navigation.</param>
+/// <param name="viewLocator">The view locator.</param>
+/// <param name="viewModelFactory">The view model factory.</param>
+public sealed class PopupViewStackService(IView view, IPopupNavigation popupNavigation, IViewLocator viewLocator, IViewModelFactory viewModelFactory)
+    : PopupViewStackServiceBase(view, popupNavigation, viewLocator, viewModelFactory);
diff --git a/src/Sextant.Plugins.Popup/PopupViewStackServiceBase.cs b/src/Sextant.Plugins.Popup/PopupViewStackServiceBase.cs
index 389fc42d..55e0609e 100644
--- a/src/Sextant.Plugins.Popup/PopupViewStackServiceBase.cs
+++ b/src/Sextant.Plugins.Popup/PopupViewStackServiceBase.cs
@@ -12,265 +12,244 @@
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using System.Reactive.Subjects;
+using Mopups.Events;
+using Mopups.Interfaces;
+using Mopups.Pages;
 using ReactiveUI;
-using Rg.Plugins.Popup.Contracts;
-using Rg.Plugins.Popup.Events;
-using Rg.Plugins.Popup.Pages;
 
-namespace Sextant.Plugins.Popup
+namespace Sextant.Plugins.Popup;
+
+/// <summary>
+/// Represents a popup view stack service implementation.
+/// </summary>
+public abstract class PopupViewStackServiceBase : ParameterViewStackServiceBase, IPopupViewStackService
 {
+    private readonly IPopupNavigation _popupNavigation;
+    private readonly IViewLocator _viewLocator;
+
     /// <summary>
-    /// Represents a popup view stack service implementation.
+    /// Initializes a new instance of the <see cref="PopupViewStackServiceBase"/> class.
     /// </summary>
-    public abstract class PopupViewStackServiceBase : ParameterViewStackServiceBase, IPopupViewStackService
+    /// <param name="view">The view.</param>
+    /// <param name="popupNavigation">The popup navigation.</param>
+    /// <param name="viewLocator">The view locator.</param>
+    /// <param name="viewModelFactory">The view model factory.</param>
+    protected PopupViewStackServiceBase(IView view, IPopupNavigation popupNavigation, IViewLocator viewLocator, IViewModelFactory viewModelFactory)
+        : base(view, viewModelFactory)
     {
-        private readonly IPopupNavigation _popupNavigation;
-        private readonly IViewLocator _viewLocator;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PopupViewStackServiceBase"/> class.
-        /// </summary>
-        /// <param name="view">The view.</param>
-        /// <param name="popupNavigation">The popup navigation.</param>
-        /// <param name="viewLocator">The view locator.</param>
-        /// <param name="viewModelFactory">The view model factory.</param>
-        protected PopupViewStackServiceBase(IView view, IPopupNavigation popupNavigation, IViewLocator viewLocator, IViewModelFactory viewModelFactory)
-            : base(view, viewModelFactory)
-        {
-            _popupNavigation = popupNavigation;
-            _viewLocator = viewLocator;
-            PopupSubject = new BehaviorSubject<IImmutableList<IViewModel>>(ImmutableList<IViewModel>.Empty);
+        _popupNavigation = popupNavigation;
+        _viewLocator = viewLocator;
+        PopupSubject = new BehaviorSubject<IImmutableList<IViewModel>>(ImmutableList<IViewModel>.Empty);
 
-            Pushing = Observable.FromEvent<EventHandler<PopupNavigationEventArgs>, PopupNavigationEventArgs>(
-                eventHandler =>
-                {
-                    void Handler(object? sender, PopupNavigationEventArgs args) => eventHandler(args);
+        Pushing = Observable.FromEvent<EventHandler<PopupNavigationEventArgs>, PopupNavigationEventArgs>(
+            eventHandler =>
+            {
+                void Handler(object? sender, PopupNavigationEventArgs args) => eventHandler(args);
 
-                    return Handler;
-                },
-                x => _popupNavigation.Pushing += x,
-                x => _popupNavigation.Pushing -= x)
-                .Select(x => new PopupNavigationEvent((IViewFor)x.Page, x.IsAnimated));
+                return Handler;
+            },
+            x => _popupNavigation.Pushing += x,
+            x => _popupNavigation.Pushing -= x)
+            .Select(x => new PopupNavigationEvent((IViewFor)x.Page, x.IsAnimated));
 
-            Pushed = Observable.FromEvent<EventHandler<PopupNavigationEventArgs>, PopupNavigationEventArgs>(
-                eventHandler =>
-                {
-                    void Handler(object? sender, PopupNavigationEventArgs args)
-                        => eventHandler(args);
+        Pushed = Observable.FromEvent<EventHandler<PopupNavigationEventArgs>, PopupNavigationEventArgs>(
+            eventHandler =>
+            {
+                void Handler(object? sender, PopupNavigationEventArgs args)
+                    => eventHandler(args);
 
-                    return Handler;
-                },
-                x => _popupNavigation.Pushed += x,
-                x => _popupNavigation.Pushed -= x)
-                .Select(x => new PopupNavigationEvent((IViewFor)x.Page, x.IsAnimated));
+                return Handler;
+            },
+            x => _popupNavigation.Pushed += x,
+            x => _popupNavigation.Pushed -= x)
+            .Select(x => new PopupNavigationEvent((IViewFor)x.Page, x.IsAnimated));
 
-            Popping = Observable.FromEvent<EventHandler<PopupNavigationEventArgs>, PopupNavigationEventArgs>(
-                eventHandler =>
-                {
-                    void Handler(object? sender, PopupNavigationEventArgs args)
-                        => eventHandler(args);
+        Popping = Observable.FromEvent<EventHandler<PopupNavigationEventArgs>, PopupNavigationEventArgs>(
+            eventHandler =>
+            {
+                void Handler(object? sender, PopupNavigationEventArgs args)
+                    => eventHandler(args);
 
-                    return Handler;
-                },
-                x => _popupNavigation.Popping += x,
-                x => _popupNavigation.Popping -= x)
-                .Select(x => new PopupNavigationEvent((IViewFor)x.Page, x.IsAnimated));
+                return Handler;
+            },
+            x => _popupNavigation.Popping += x,
+            x => _popupNavigation.Popping -= x)
+            .Select(x => new PopupNavigationEvent((IViewFor)x.Page, x.IsAnimated));
 
-            Popped = Observable.FromEvent<EventHandler<PopupNavigationEventArgs>, PopupNavigationEventArgs>(
-                eventHandler =>
-                {
-                    void Handler(object? sender, PopupNavigationEventArgs args) => eventHandler(args);
+        Popped = Observable.FromEvent<EventHandler<PopupNavigationEventArgs>, PopupNavigationEventArgs>(
+            eventHandler =>
+            {
+                void Handler(object? sender, PopupNavigationEventArgs args) => eventHandler(args);
 
-                    return Handler;
-                },
-                x => _popupNavigation.Popped += x,
-                x => _popupNavigation.Popped -= x)
-                .Select(x => new PopupNavigationEvent((IViewFor)x.Page, x.IsAnimated));
+                return Handler;
+            },
+            x => _popupNavigation.Popped += x,
+            x => _popupNavigation.Popped -= x)
+            .Select(x => new PopupNavigationEvent((IViewFor)x.Page, x.IsAnimated));
 
-            Popped
-                .Subscribe(popped => popped.ViewModel.InvokeViewModelAction<IDestructible>(x => x.Destroy()))
-                .DisposeWith(NavigationDisposables);
+        Popped
+            .Subscribe(popped => popped.ViewModel.InvokeViewModelAction<IDestructible>(x => x.Destroy()))
+            .DisposeWith(NavigationDisposables);
 
-            PopupSubject.DisposeWith(NavigationDisposables);
-        }
+        PopupSubject.DisposeWith(NavigationDisposables);
+    }
 
-        /// <inheritdoc/>
-        public IObservable<PopupNavigationEvent> Pushing { get; }
+    /// <inheritdoc/>
+    public IObservable<PopupNavigationEvent> Pushing { get; }
 
-        /// <inheritdoc/>
-        public IObservable<PopupNavigationEvent> Pushed { get; }
+    /// <inheritdoc/>
+    public IObservable<PopupNavigationEvent> Pushed { get; }
 
-        /// <inheritdoc/>
-        public IObservable<PopupNavigationEvent> Popping { get; }
+    /// <inheritdoc/>
+    public IObservable<PopupNavigationEvent> Popping { get; }
 
-        /// <inheritdoc/>
-        public IObservable<PopupNavigationEvent> Popped { get; }
+    /// <inheritdoc/>
+    public IObservable<PopupNavigationEvent> Popped { get; }
 
-        /// <inheritdoc/>
-        public IReadOnlyList<IViewModel> PopupStack =>
+    /// <inheritdoc/>
+    public IReadOnlyList<IViewModel> PopupStack =>
 #pragma warning disable 8619
-            _popupNavigation
-                .PopupStack
-                .Cast<IViewFor<IViewModel>>()
-                .Where(x => x is not null)
-                .Select(x => x.ViewModel)
-                .ToList();
+        _popupNavigation
+            .PopupStack
+            .Cast<IViewFor<IViewModel>>()
+            .Where(x => x is not null)
+            .Select(x => x.ViewModel)
+            .ToList();
 #pragma warning restore 8619
 
-        /// <summary>
-        /// Gets the popup subject that contains the stack history.
-        /// </summary>
-        protected BehaviorSubject<IImmutableList<IViewModel>> PopupSubject { get; }
-
-        /// <inheritdoc/>
-        public IObservable<Unit> PushPopup(IViewModel viewModel, string? contract = null, bool animate = true)
-        {
-            if (viewModel is null)
-            {
-                throw new ArgumentNullException(nameof(viewModel));
-            }
-
-            PopupPage popupPage = LocatePopupFor(viewModel, contract);
+    /// <summary>
+    /// Gets the popup subject that contains the stack history.
+    /// </summary>
+    protected BehaviorSubject<IImmutableList<IViewModel>> PopupSubject { get; }
 
-            return Observable
-                .FromAsync(() => _popupNavigation.PushAsync(popupPage, animate))
-                .Do(_ =>
-                {
-                    AddToStackAndTick(PopupSubject, viewModel, false);
-                    Logger.Debug($"Added page '{viewModel.Id}' (contract '{contract}') to stack.");
-                });
-        }
+    /// <inheritdoc/>
+    public IObservable<Unit> PushPopup(IViewModel viewModel, string? contract = null, bool animate = true)
+    {
+        ArgumentNullException.ThrowIfNull(viewModel);
 
-        /// <inheritdoc/>
-        public IObservable<Unit> PushPopup<TViewModel>(string? contract = null, bool animate = true)
-            where TViewModel : IViewModel
-        {
-            var viewModel = Factory.Create<TViewModel>();
-            return PushPopup(viewModel, contract, animate);
-        }
+        PopupPage popupPage = LocatePopupFor(viewModel, contract);
 
-        /// <inheritdoc/>
-        public IObservable<Unit> PushPopup(
-            INavigable viewModel,
-            INavigationParameter navigationParameter,
-            string? contract = null,
-            bool animate = true) =>
-            Observable.Create<Unit>(observer =>
+        return Observable
+            .FromAsync(() => _popupNavigation.PushAsync(popupPage, animate))
+            .Do(_ =>
             {
-                if (viewModel == null)
-                {
-                    throw new ArgumentNullException(nameof(viewModel));
-                }
-
-                if (navigationParameter == null)
-                {
-                    throw new ArgumentNullException(nameof(navigationParameter));
-                }
-
-                var compositeDisposable = new CompositeDisposable();
-
-                Observable
-                    .Start(() => LocatePopupFor(viewModel, contract), CurrentThreadScheduler.Instance)
-                    .ObserveOn(CurrentThreadScheduler.Instance)
-                    .Select(popup =>
-                    {
-                        popup
-                            .ViewModel?
-                            .InvokeViewModelAction<INavigating>(x =>
-                                x.WhenNavigatingTo(navigationParameter)
-                                    .Subscribe()
-                                    .DisposeWith(compositeDisposable));
-                        return popup;
-                    })
-                    .Select(popup =>
-                        Observable
-                            .FromAsync(() => _popupNavigation.PushAsync(popup, animate))
-                            .Select(_ =>
-                                popup
-                                    .ViewModel?
-                                    .InvokeViewModelAction<INavigated>(x =>
-                                        x.WhenNavigatedTo(navigationParameter)
-                                            .Subscribe()
-                                            .DisposeWith(compositeDisposable))))
-                    .Switch()
-                    .Do(_ =>
-                    {
-                        AddToStackAndTick(PopupSubject, viewModel, false);
-                        Logger.Debug($"Added page '{viewModel.Id}' (contract '{contract}') to stack.");
-                    })
-                    .Select(_ => Unit.Default)
-                    .Subscribe(observer)
-                    .DisposeWith(compositeDisposable);
-
-                return Disposable.Create(() => compositeDisposable.Dispose());
+                AddToStackAndTick(PopupSubject, viewModel, false);
+                Logger.Debug($"Added page '{viewModel.Id}' (contract '{contract}') to stack.");
             });
+    }
+
+    /// <inheritdoc/>
+    public IObservable<Unit> PushPopup<TViewModel>(string? contract = null, bool animate = true)
+        where TViewModel : IViewModel
+    {
+        var viewModel = Factory.Create<TViewModel>();
+        return PushPopup(viewModel, contract, animate);
+    }
 
-        /// <inheritdoc/>
-        public IObservable<Unit> PushPopup<TViewModel>(
-            INavigationParameter navigationParameter,
-            string? contract = null,
-            bool animate = true)
-            where TViewModel : INavigable
+    /// <inheritdoc/>
+    public IObservable<Unit> PushPopup(
+        INavigable viewModel,
+        INavigationParameter navigationParameter,
+        string? contract = null,
+        bool animate = true) =>
+        Observable.Create<Unit>(observer =>
         {
-            var viewModel = Factory.Create<TViewModel>(contract);
+            ArgumentNullException.ThrowIfNull(viewModel);
 
-            return PushPopup(viewModel, navigationParameter, contract, animate);
-        }
+            ArgumentNullException.ThrowIfNull(navigationParameter);
 
-        /// <inheritdoc/>
-        public IObservable<Unit> PopPopup(bool animate = true) =>
-            Observable.FromAsync(() => _popupNavigation.PopAsync(animate));
+            var compositeDisposable = new CompositeDisposable();
 
-        /// <inheritdoc/>
-        public IObservable<Unit> PopAllPopups(bool animate = true) =>
             Observable
-                .FromAsync(() => _popupNavigation.PopAllAsync(animate))
-                .Do(_ => PopRootAndTick(PopupSubject, NavigationDisposables));
+                .Start(() => LocatePopupFor(viewModel, contract), CurrentThreadScheduler.Instance)
+                .ObserveOn(CurrentThreadScheduler.Instance)
+                .Select(popup =>
+                {
+                    popup
+                        .ViewModel?
+                        .InvokeViewModelAction<INavigating>(x =>
+                            x.WhenNavigatingTo(navigationParameter)
+                                .Subscribe()
+                                .DisposeWith(compositeDisposable));
+                    return popup;
+                })
+                .Select(popup =>
+                    Observable
+                        .FromAsync(() => _popupNavigation.PushAsync(popup, animate))
+                        .Select(_ =>
+                            popup
+                                .ViewModel?
+                                .InvokeViewModelAction<INavigated>(x =>
+                                    x.WhenNavigatedTo(navigationParameter)
+                                        .Subscribe()
+                                        .DisposeWith(compositeDisposable))))
+                .Switch()
+                .Do(_ =>
+                {
+                    AddToStackAndTick(PopupSubject, viewModel, false);
+                    Logger.Debug($"Added page '{viewModel.Id}' (contract '{contract}') to stack.");
+                })
+                .Select(_ => Unit.Default)
+                .Subscribe(observer)
+                .DisposeWith(compositeDisposable);
+
+            return Disposable.Create(() => compositeDisposable.Dispose());
+        });
+
+    /// <inheritdoc/>
+    public IObservable<Unit> PushPopup<TViewModel>(
+        INavigationParameter navigationParameter,
+        string? contract = null,
+        bool animate = true)
+        where TViewModel : INavigable
+    {
+        var viewModel = Factory.Create<TViewModel>(contract);
 
-        /// <inheritdoc/>
-        public IObservable<Unit> RemovePopup(IViewModel viewModel, string? contract = null, bool animate = true)
-        {
-            if (viewModel is null)
-            {
-                throw new ArgumentNullException(nameof(viewModel));
-            }
+        return PushPopup(viewModel, navigationParameter, contract, animate);
+    }
 
-            PopupPage popupPage = LocatePopupFor(viewModel, contract);
+    /// <inheritdoc/>
+    public IObservable<Unit> PopPopup(bool animate = true) =>
+        Observable.FromAsync(() => _popupNavigation.PopAsync(animate));
 
-            return Observable.FromAsync(() => _popupNavigation.RemovePageAsync(popupPage, animate))
-                             .Do(_ => RemoveFromStackAndTick(PopupSubject, viewModel));
-        }
+    /// <inheritdoc/>
+    public IObservable<Unit> PopAllPopups(bool animate = true) =>
+        Observable
+            .FromAsync(() => _popupNavigation.PopAllAsync(animate))
+            .Do(_ => PopRootAndTick(PopupSubject, NavigationDisposables));
 
-        private static void RemoveFromStackAndTick<T>(BehaviorSubject<IImmutableList<T>> stackSubject, T item)
-        {
-            if (stackSubject is null)
-            {
-                throw new ArgumentNullException(nameof(stackSubject));
-            }
+    /// <inheritdoc/>
+    public IObservable<Unit> RemovePopup(IViewModel viewModel, string? contract = null, bool animate = true)
+    {
+        ArgumentNullException.ThrowIfNull(viewModel);
 
-            var stack = stackSubject.Value;
+        PopupPage popupPage = LocatePopupFor(viewModel, contract);
 
-            stack = stack.Remove(item);
+        return Observable.FromAsync(() => _popupNavigation.RemovePageAsync(popupPage, animate))
+                         .Do(_ => RemoveFromStackAndTick(PopupSubject, viewModel));
+    }
 
-            stackSubject.OnNext(stack);
-        }
+    private static void RemoveFromStackAndTick<T>(BehaviorSubject<IImmutableList<T>> stackSubject, T item)
+    {
+        ArgumentNullException.ThrowIfNull(stackSubject);
 
-        private SextantPopupPage LocatePopupFor(IViewModel viewModel, string? contract)
-        {
-            IViewFor? view = _viewLocator.ResolveView(viewModel, contract);
-            if (view is null)
-            {
-                throw new InvalidOperationException($"No view could be located for type '{viewModel.GetType().FullName}', contract '{contract}'. Be sure Splat has an appropriate registration.");
-            }
+        var stack = stackSubject.Value;
 
-            if (!(view is SextantPopupPage page))
-            {
-                throw new InvalidOperationException($"Resolved view '{view.GetType().FullName}' for type '{viewModel.GetType().FullName}', contract '{contract}' is not a {nameof(SextantPopupPage)}.");
-            }
+        stack = stack.Remove(item);
 
-            page.ViewModel = viewModel;
+        stackSubject.OnNext(stack);
+    }
 
-            return page;
+    private SextantPopupPage LocatePopupFor(IViewModel viewModel, string? contract)
+    {
+        var view = _viewLocator.ResolveView(viewModel, contract) ?? throw new InvalidOperationException($"No view could be located for type '{viewModel.GetType().FullName}', contract '{contract}'. Be sure Splat has an appropriate registration.");
+        if (view is not SextantPopupPage page)
+        {
+            throw new InvalidOperationException($"Resolved view '{view.GetType().FullName}' for type '{viewModel.GetType().FullName}', contract '{contract}' is not a {nameof(SextantPopupPage)}.");
         }
+
+        page.ViewModel = viewModel;
+
+        return page;
     }
 }
diff --git a/src/Sextant.Plugins.Popup/Sextant.Plugins.Popup.csproj b/src/Sextant.Plugins.Popup/Sextant.Plugins.Popup.csproj
index 9c808141..d2286d9b 100644
--- a/src/Sextant.Plugins.Popup/Sextant.Plugins.Popup.csproj
+++ b/src/Sextant.Plugins.Popup/Sextant.Plugins.Popup.csproj
@@ -1,15 +1,13 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <LangVersion>latest</LangVersion>
-    <Nullable>enable</Nullable>
-    <AssemblyName>Sextant.Plugins.Popup</AssemblyName>
-    <PackageId>Sextant.Plugins.Popup</PackageId>
+    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
+    <UseMaui>true</UseMaui>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Sextant.XamForms\Sextant.XamForms.csproj" />
+    <PackageReference Include="Mopups"/>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Rg.Plugins.Popup" />
+    <ProjectReference Include="..\Sextant.Maui\Sextant.Maui.csproj" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Sextant.Plugins.Popup/SextantPopupPage.cs b/src/Sextant.Plugins.Popup/SextantPopupPage.cs
index ec57f698..7837dcaa 100644
--- a/src/Sextant.Plugins.Popup/SextantPopupPage.cs
+++ b/src/Sextant.Plugins.Popup/SextantPopupPage.cs
@@ -4,118 +4,66 @@
 // See the LICENSE file in the project root for full license information.
 
 using System;
-using System.Diagnostics.CodeAnalysis;
 using System.Reactive;
 using System.Reactive.Linq;
+using Microsoft.Maui.Controls;
+using Mopups.Pages;
 using ReactiveUI;
-using Rg.Plugins.Popup.Pages;
-using Xamarin.Forms;
 
-[assembly:SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1402:FileMayOnlyContainASingleType", Justification = "Contains generic.")]
+namespace Sextant.Plugins.Popup;
 
-namespace Sextant.Plugins.Popup
+/// <summary>
+/// Base Popup page for that implements <see cref="IViewFor"/>.
+/// </summary>
+public abstract class SextantPopupPage : PopupPage, IViewFor
 {
     /// <summary>
-    /// Base Popup page for that implements <see cref="IViewFor"/>.
+    /// The view model property.
     /// </summary>
-    /// <typeparam name="TViewModel">The view model type.</typeparam>
-    public abstract class SextantPopupPage<TViewModel> : SextantPopupPage, IViewFor<TViewModel>
-        where TViewModel : class, IViewModel
-    {
-        /// <summary>
-        /// The view model property.
-        /// </summary>
-        public static new readonly BindableProperty ViewModelProperty = BindableProperty.Create(
-            nameof(ViewModel),
-            typeof(TViewModel),
-            typeof(IViewFor<TViewModel>),
-            null,
-            BindingMode.OneWay,
-            null,
-            OnViewModelChanged);
-
-        /// <summary>
-        /// Gets or sets the ViewModel to display.
-        /// </summary>
-        public new TViewModel? ViewModel
-        {
-            get => (TViewModel?)GetValue(ViewModelProperty);
-            set => SetValue(ViewModelProperty, value);
-        }
+    public static readonly BindableProperty ViewModelProperty = BindableProperty.Create(
+        nameof(ViewModel),
+        typeof(object),
+        typeof(IViewFor<object>),
+        null,
+        BindingMode.OneWay,
+        null,
+        OnViewModelChanged);
 
-        /// <summary>
-        /// Gets or sets the ViewModel corresponding to this specific View.
-        /// This should be a BindableProperty if you're using XAML.
-        /// </summary>
-        object? IViewFor.ViewModel
-        {
-            get => ViewModel;
-            set => ViewModel = (TViewModel?)value;
-        }
-
-        /// <inheritdoc/>
-        protected override void OnBindingContextChanged()
-        {
-            base.OnBindingContextChanged();
-            ViewModel = (BindingContext as TViewModel)!;
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="SextantPopupPage"/> class.
+    /// </summary>
+    protected SextantPopupPage() =>
+        BackgroundClick =
+            Observable.FromEvent<EventHandler, Unit>(
+                handler =>
+                {
+                    void EventHandler(object? sender, EventArgs args) => handler(Unit.Default);
+                    return EventHandler;
+                },
+                x => BackgroundClicked += x,
+                x => BackgroundClicked -= x);
 
-        private static void OnViewModelChanged(BindableObject bindableObject, object oldValue, object newValue) => bindableObject.BindingContext = newValue;
-    }
+    /// <summary>
+    /// Gets the background click observable signal.
+    /// </summary>
+    /// <value>The background click.</value>
+    public IObservable<Unit> BackgroundClick { get; }
 
     /// <summary>
-    /// Base Popup page for that implements <see cref="IViewFor"/>.
+    /// Gets or sets the ViewModel to display.
     /// </summary>
-    public abstract class SextantPopupPage : PopupPage, IViewFor
+    public object? ViewModel
     {
-        /// <summary>
-        /// The view model property.
-        /// </summary>
-        public static readonly BindableProperty ViewModelProperty = BindableProperty.Create(
-            nameof(ViewModel),
-            typeof(object),
-            typeof(IViewFor<object>),
-            null,
-            BindingMode.OneWay,
-            null,
-            OnViewModelChanged);
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SextantPopupPage"/> class.
-        /// </summary>
-        protected SextantPopupPage() =>
-            BackgroundClick =
-                Observable.FromEvent<EventHandler, Unit>(
-                    handler =>
-                    {
-                        void EventHandler(object? sender, EventArgs args) => handler(Unit.Default);
-                        return EventHandler;
-                    },
-                    x => BackgroundClicked += x,
-                    x => BackgroundClicked -= x);
-
-        /// <summary>
-        /// Gets the background click observable signal.
-        /// </summary>
-        /// <value>The background click.</value>
-        public IObservable<Unit> BackgroundClick { get; }
-
-        /// <summary>
-        /// Gets or sets the ViewModel to display.
-        /// </summary>
-        public object? ViewModel
-        {
-            get => GetValue(ViewModelProperty);
-            set => SetValue(ViewModelProperty, value);
-        }
-
-        /// <inheritdoc/>
-        protected override void OnBindingContextChanged()
-        {
-            base.OnBindingContextChanged();
-            ViewModel = BindingContext;
-        }
+        get => GetValue(ViewModelProperty);
+        set => SetValue(ViewModelProperty, value);
+    }
 
-        private static void OnViewModelChanged(BindableObject bindableObject, object oldValue, object newValue) => bindableObject.BindingContext = newValue;
+    /// <inheritdoc/>
+    protected override void OnBindingContextChanged()
+    {
+        base.OnBindingContextChanged();
+        ViewModel = BindingContext;
     }
+
+    private static void OnViewModelChanged(BindableObject bindableObject, object oldValue, object newValue) => bindableObject.BindingContext = newValue;
 }
diff --git a/src/Sextant.Plugins.Popup/SextantPopupPage{TViewModel}.cs b/src/Sextant.Plugins.Popup/SextantPopupPage{TViewModel}.cs
new file mode 100644
index 00000000..ff8ba75b
--- /dev/null
+++ b/src/Sextant.Plugins.Popup/SextantPopupPage{TViewModel}.cs
@@ -0,0 +1,57 @@
+// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for full license information.
+
+using Microsoft.Maui.Controls;
+using ReactiveUI;
+
+namespace Sextant.Plugins.Popup;
+
+/// <summary>
+/// Base Popup page for that implements <see cref="IViewFor"/>.
+/// </summary>
+/// <typeparam name="TViewModel">The view model type.</typeparam>
+public abstract class SextantPopupPage<TViewModel> : SextantPopupPage, IViewFor<TViewModel>
+    where TViewModel : class, IViewModel
+{
+    /// <summary>
+    /// The view model property.
+    /// </summary>
+    public static new readonly BindableProperty ViewModelProperty = BindableProperty.Create(
+        nameof(ViewModel),
+        typeof(TViewModel),
+        typeof(IViewFor<TViewModel>),
+        null,
+        BindingMode.OneWay,
+        null,
+        OnViewModelChanged);
+
+    /// <summary>
+    /// Gets or sets the ViewModel to display.
+    /// </summary>
+    public new TViewModel? ViewModel
+    {
+        get => (TViewModel?)GetValue(ViewModelProperty);
+        set => SetValue(ViewModelProperty, value);
+    }
+
+    /// <summary>
+    /// Gets or sets the ViewModel corresponding to this specific View.
+    /// This should be a BindableProperty if you're using XAML.
+    /// </summary>
+    object? IViewFor.ViewModel
+    {
+        get => ViewModel;
+        set => ViewModel = (TViewModel?)value;
+    }
+
+    /// <inheritdoc/>
+    protected override void OnBindingContextChanged()
+    {
+        base.OnBindingContextChanged();
+        ViewModel = (BindingContext as TViewModel)!;
+    }
+
+    private static void OnViewModelChanged(BindableObject bindableObject, object oldValue, object newValue) => bindableObject.BindingContext = newValue;
+}
diff --git a/src/Sextant.Tests/API/ApiApprovalTests.Sextant.DotNet6_0.verified.txt b/src/Sextant.Tests/API/ApiApprovalTests.Sextant.DotNet6_0.verified.txt
index f08047bb..1e516cd8 100644
--- a/src/Sextant.Tests/API/ApiApprovalTests.Sextant.DotNet6_0.verified.txt
+++ b/src/Sextant.Tests/API/ApiApprovalTests.Sextant.DotNet6_0.verified.txt
@@ -19,6 +19,9 @@ namespace Sextant
         public static Splat.IMutableDependencyResolver RegisterView<TView, TViewModel>(this Splat.IMutableDependencyResolver dependencyResolver, System.Func<TView> viewFactory, string? contract = null)
             where TView :  class, ReactiveUI.IViewFor
             where TViewModel :  class, Sextant.IViewModel { }
+        public static Splat.IMutableDependencyResolver RegisterViewForNavigation<TView, TViewModel>(this Splat.IMutableDependencyResolver resolver)
+            where TView :  class, ReactiveUI.IViewFor<TViewModel>, new ()
+            where TViewModel :  class, Sextant.IViewModel, new () { }
         public static Splat.IMutableDependencyResolver RegisterViewForNavigation<TView, TViewModel>(this Splat.IMutableDependencyResolver resolver, System.Func<TView> viewFactory, System.Func<TViewModel> viewModelFactory)
             where TView :  class, ReactiveUI.IViewFor<TViewModel>
             where TViewModel :  class, Sextant.IViewModel { }
@@ -60,8 +63,6 @@ namespace Sextant
         T GetValue<T>(string key);
         bool TryGetValue<T>(string key, out T value);
     }
-    [System.Obsolete("Please use the IViewModel interface.")]
-    public interface IPageViewModel : Sextant.IViewModel { }
     public interface IParameterViewStackService : Sextant.IViewStackService
     {
         System.IObservable<System.Reactive.Unit> PopPage(Sextant.INavigationParameter parameter, bool animate = true);
@@ -84,7 +85,7 @@ namespace Sextant
     }
     public interface IViewModel
     {
-        string Id { get; }
+        string? Id { get; }
     }
     public interface IViewModelFactory
     {
diff --git a/src/Sextant.Tests/API/ApiApprovalTests.Sextant.DotNet8_0.verified.txt b/src/Sextant.Tests/API/ApiApprovalTests.Sextant.DotNet8_0.verified.txt
index e5c48c46..0335c564 100644
--- a/src/Sextant.Tests/API/ApiApprovalTests.Sextant.DotNet8_0.verified.txt
+++ b/src/Sextant.Tests/API/ApiApprovalTests.Sextant.DotNet8_0.verified.txt
@@ -19,6 +19,9 @@ namespace Sextant
         public static Splat.IMutableDependencyResolver RegisterView<TView, TViewModel>(this Splat.IMutableDependencyResolver dependencyResolver, System.Func<TView> viewFactory, string? contract = null)
             where TView :  class, ReactiveUI.IViewFor
             where TViewModel :  class, Sextant.IViewModel { }
+        public static Splat.IMutableDependencyResolver RegisterViewForNavigation<TView, TViewModel>(this Splat.IMutableDependencyResolver resolver)
+            where TView :  class, ReactiveUI.IViewFor<TViewModel>, new ()
+            where TViewModel :  class, Sextant.IViewModel, new () { }
         public static Splat.IMutableDependencyResolver RegisterViewForNavigation<TView, TViewModel>(this Splat.IMutableDependencyResolver resolver, System.Func<TView> viewFactory, System.Func<TViewModel> viewModelFactory)
             where TView :  class, ReactiveUI.IViewFor<TViewModel>
             where TViewModel :  class, Sextant.IViewModel { }
@@ -60,8 +63,6 @@ namespace Sextant
         T GetValue<T>(string key);
         bool TryGetValue<T>(string key, out T value);
     }
-    [System.Obsolete("Please use the IViewModel interface.")]
-    public interface IPageViewModel : Sextant.IViewModel { }
     public interface IParameterViewStackService : Sextant.IViewStackService
     {
         System.IObservable<System.Reactive.Unit> PopPage(Sextant.INavigationParameter parameter, bool animate = true);
@@ -84,7 +85,7 @@ namespace Sextant
     }
     public interface IViewModel
     {
-        string Id { get; }
+        string? Id { get; }
     }
     public interface IViewModelFactory
     {
diff --git a/src/Sextant.Tests/DependencyResolverMixinTests.cs b/src/Sextant.Tests/DependencyResolverMixinTests.cs
index c84b8fd4..f3a434ea 100644
--- a/src/Sextant.Tests/DependencyResolverMixinTests.cs
+++ b/src/Sextant.Tests/DependencyResolverMixinTests.cs
@@ -67,7 +67,7 @@ public sealed class TheRegisterViewMethod
             public void Should_Register_View()
             {
                 // Given
-                Locator.CurrentMutable.RegisterView<PageView, NavigableViewModelMock>();
+                Locator.CurrentMutable.RegisterViewForNavigation<PageView, NavigableViewModelMock>();
 
                 // When
                 var result = Locator.Current.GetService<IViewFor<NavigableViewModelMock>>();
@@ -83,7 +83,8 @@ public void Should_Register_View()
             public void Should_Register_View_Factory()
             {
                 // Given
-                Locator.CurrentMutable.RegisterView<PageView, NavigableViewModelMock>(() => new PageView());
+                Locator.CurrentMutable.RegisterViewForNavigation(() => new PageView(), () => new NavigableViewModelMock());
+                ////Locator.CurrentMutable.RegisterView<PageView, NavigableViewModelMock>(() => new PageView());
 
                 // When
                 var result = Locator.Current.GetService<IViewFor<NavigableViewModelMock>>();
diff --git a/src/Sextant.Tests/Navigation/NavigationParameterTests.cs b/src/Sextant.Tests/Navigation/NavigationParameterTests.cs
index 61283f5d..2fcb9e82 100644
--- a/src/Sextant.Tests/Navigation/NavigationParameterTests.cs
+++ b/src/Sextant.Tests/Navigation/NavigationParameterTests.cs
@@ -12,7 +12,7 @@ namespace Sextant.Tests
     /// <summary>
     /// Tests <see cref="NavigationParameter"/> and extensions.
     /// </summary>
-    public class NavigationParameterTests
+    public static class NavigationParameterTests
     {
         /// <summary>
         /// Tests the get value method.
diff --git a/src/Sextant.Tests/Navigation/ParameterViewStackServiceTests.cs b/src/Sextant.Tests/Navigation/ParameterViewStackServiceTests.cs
index b33f0eae..a4adcd4a 100644
--- a/src/Sextant.Tests/Navigation/ParameterViewStackServiceTests.cs
+++ b/src/Sextant.Tests/Navigation/ParameterViewStackServiceTests.cs
@@ -79,7 +79,7 @@ public async Task Should_Throw_If_View_Model_Null()
                 // When
                 var result =
                     await Record.ExceptionAsync(async () => await sut.PushPage(null!, navigationParameter))
-                        .ConfigureAwait(false);
+                        .ConfigureAwait(true);
 
                 // Then
                 result.Should().BeOfType<ArgumentNullException>().Which.ParamName.Should().Be("navigableViewModel");
@@ -99,7 +99,7 @@ public async Task Should_Throw_If_Parameter_Null()
                 // When
                 var result =
                     await Record.ExceptionAsync(async () => await sut.PushPage(viewModel, null!))
-                        .ConfigureAwait(false);
+                        .ConfigureAwait(true);
 
                 // Then
                 result.Should().BeOfType<ArgumentNullException>().Which.ParamName.Should().Be("parameter");
@@ -199,7 +199,7 @@ public async Task Should_Call_In_Order()
             [InlineData("hello", true, false)]
             [InlineData("hello", false, true)]
             [InlineData("hello", false, false)]
-            public async Task Should_Call_View(string contract, bool reset, bool animate)
+            public async Task Should_Call_View(string? contract, bool reset, bool animate)
             {
                 // Given
                 var viewModel = Substitute.For<INavigable>();
@@ -243,7 +243,7 @@ public async Task Should_Throw_If_View_Model_Null()
                 // When
                 var result =
                     await Record.ExceptionAsync(async () => await sut.PushPage<NullViewModelMock>(navigationParameter))
-                        .ConfigureAwait(false);
+                        .ConfigureAwait(true);
 
                 // Then
                 result.Should().BeOfType<ArgumentNullException>().Which.ParamName.Should().Be("navigableViewModel");
@@ -262,7 +262,7 @@ public async Task Should_Throw_If_Parameter_Null()
                 // When
                 var result =
                     await Record.ExceptionAsync(async () => await sut.PushPage<NavigableViewModelMock>(null!))
-                        .ConfigureAwait(false);
+                        .ConfigureAwait(true);
 
                 // Then
                 result.Should().BeOfType<ArgumentNullException>().Which.ParamName.Should().Be("parameter");
@@ -282,7 +282,7 @@ await Record.ExceptionAsync(async () => await sut.PushPage<NavigableViewModelMoc
             [InlineData("hello", true, false)]
             [InlineData("hello", false, true)]
             [InlineData("hello", false, false)]
-            public async Task Should_Call_View(string contract, bool reset, bool animate)
+            public async Task Should_Call_View(string? contract, bool reset, bool animate)
             {
                 // Given
                 var view = Substitute.For<IView>();
@@ -307,7 +307,7 @@ public async Task Should_Call_ViewModel_Factory()
                 var factory = Substitute.For<IViewModelFactory>();
                 factory.Create<NavigableViewModelMock>().Returns(new NavigableViewModelMock());
                 var navigationParameter = Substitute.For<INavigationParameter>();
-                ParameterViewStackService sut = new ParameterViewStackServiceFixture().WithFactory(factory);
+                var sut = new ParameterViewStackServiceFixture().WithFactory(factory);
 
                 // When
                 await sut.PushPage<NavigableViewModelMock>(navigationParameter);
@@ -336,7 +336,7 @@ public async Task Should_Throw_If_View_Model_Null()
                 // When
                 var result =
                     await Record.ExceptionAsync(async () => await sut.PushModal(null!, navigationParameter))
-                        .ConfigureAwait(false);
+                        .ConfigureAwait(true);
 
                 // Then
                 result.Should().BeOfType<ArgumentNullException>().Which.ParamName.Should().Be("navigableModal");
@@ -356,7 +356,7 @@ public async Task Should_Throw_If_Parameter_Null()
                 // When
                 var result =
                     await Record.ExceptionAsync(async () => await sut.PushModal(viewModel, null!))
-                        .ConfigureAwait(false);
+                        .ConfigureAwait(true);
 
                 // Then
                 result.Should().BeOfType<ArgumentNullException>().Which.ParamName.Should().Be("parameter");
@@ -373,7 +373,7 @@ await Record.ExceptionAsync(async () => await sut.PushModal(viewModel, null!))
             [InlineData(null, true)]
             [InlineData("hello", true)]
             [InlineData("hello", false)]
-            public async Task Should_Call_View(string contract, bool withNavigation)
+            public async Task Should_Call_View(string? contract, bool withNavigation)
             {
                 // Given
                 var viewModel = Substitute.For<INavigable>();
@@ -477,7 +477,7 @@ public async Task Should_Throw_If_View_Model_Null()
                 // When
                 var result =
                     await Record.ExceptionAsync(async () => await sut.PushModal<NullViewModelMock>(navigationParameter))
-                        .ConfigureAwait(false);
+                        .ConfigureAwait(true);
 
                 // Then
                 result.Should().BeOfType<ArgumentNullException>().Which.ParamName.Should().Be("navigableModal");
@@ -496,7 +496,7 @@ public async Task Should_Throw_If_Parameter_Null()
                 // When
                 var result =
                     await Record.ExceptionAsync(async () => await sut.PushModal<NavigableViewModelMock>(null!))
-                        .ConfigureAwait(false);
+                        .ConfigureAwait(true);
 
                 // Then
                 result.Should().BeOfType<ArgumentNullException>().Which.ParamName.Should().Be("parameter");
@@ -513,7 +513,7 @@ await Record.ExceptionAsync(async () => await sut.PushModal<NavigableViewModelMo
             [InlineData(null, true)]
             [InlineData("hello", true)]
             [InlineData("hello", false)]
-            public async Task Should_Call_View(string contract, bool withNavigation)
+            public async Task Should_Call_View(string? contract, bool withNavigation)
             {
                 // Given
                 var view = Substitute.For<IView>();
@@ -542,7 +542,7 @@ public async Task Should_Call_ViewModel_Factory(string? contract)
                 var factory = Substitute.For<IViewModelFactory>();
                 factory.Create<NavigableViewModelMock>(Arg.Any<string?>()).Returns(new NavigableViewModelMock());
                 var navigationParameter = Substitute.For<INavigationParameter>();
-                ParameterViewStackService sut = new ParameterViewStackServiceFixture().WithFactory(factory);
+                var sut = new ParameterViewStackServiceFixture().WithFactory(factory);
 
                 // When
                 await sut.PushModal<NavigableViewModelMock>(navigationParameter, contract);
@@ -570,7 +570,7 @@ public async Task Should_Throw_If_Parameter_Null()
                 // When
                 var result =
                     await Record.ExceptionAsync(async () => await sut.PopPage(null!))
-                    .ConfigureAwait(false);
+                    .ConfigureAwait(true);
 
                 // Then
                 result.Should().BeOfType<ArgumentNullException>().Which.ParamName.Should().Be("parameter");
@@ -587,7 +587,7 @@ public async Task Should_Call_View()
                 var viewModel = Substitute.For<INavigable>();
                 var navigationParameter = Substitute.For<INavigationParameter>();
                 var view = Substitute.For<IView>();
-                ParameterViewStackService sut = new ParameterViewStackServiceFixture().WithView(view).WithPushed(viewModel);
+                var sut = new ParameterViewStackServiceFixture().WithView(view).WithPushed(viewModel);
 
                 // When
                 await sut.PopPage(navigationParameter);
@@ -672,7 +672,7 @@ public async Task Should_Call_When_Navigated_From()
                 // Given
                 var viewModel = Substitute.For<INavigable>();
                 var navigationParameter = Substitute.For<INavigationParameter>();
-                ParameterViewStackService sut = new ParameterViewStackServiceFixture().WithPushed(viewModel);
+                var sut = new ParameterViewStackServiceFixture().WithPushed(viewModel);
 
                 // When
                 await sut.PopPage(navigationParameter);
@@ -691,7 +691,7 @@ public async Task Should_Not_Call_When_Navigating_To()
                 // Given
                 var viewModel = Substitute.For<INavigable>();
                 var navigationParameter = Substitute.For<INavigationParameter>();
-                ParameterViewStackService sut = new ParameterViewStackServiceFixture().WithPushed(viewModel);
+                var sut = new ParameterViewStackServiceFixture().WithPushed(viewModel);
 
                 // When
                 await sut.PopPage(navigationParameter);
diff --git a/src/Sextant.Tests/Navigation/ViewStackServiceTests.cs b/src/Sextant.Tests/Navigation/ViewStackServiceTests.cs
index 422fd0b8..3cb31198 100644
--- a/src/Sextant.Tests/Navigation/ViewStackServiceTests.cs
+++ b/src/Sextant.Tests/Navigation/ViewStackServiceTests.cs
@@ -199,7 +199,7 @@ public async Task Should_Throw_If_Stack_Empty()
                 ViewStackService sut = new ViewStackServiceFixture();
 
                 // When
-                var result = await Record.ExceptionAsync(async () => await sut.PopModal()).ConfigureAwait(false);
+                var result = await Record.ExceptionAsync(async () => await sut.PopModal()).ConfigureAwait(true);
 
                 // Then
                 result.Should().BeOfType<InvalidOperationException>();
@@ -216,7 +216,7 @@ public async Task Should_Call_Destroy()
                 // Given
                 var viewModel = Substitute.For<IEverything>();
                 var view = Substitute.For<IView>();
-                ParameterViewStackService sut = new ParameterViewStackServiceFixture().WithView(view).WithModal(viewModel);
+                var sut = new ParameterViewStackServiceFixture().WithView(view).WithModal(viewModel);
 
                 // When
                 await sut.PopModal();
@@ -392,7 +392,7 @@ public async Task Should_Throw_If_Stack_Empty()
                 ViewStackService sut = new ViewStackServiceFixture();
 
                 // When
-                var result = await Record.ExceptionAsync(async () => await sut.PopToRootPage()).ConfigureAwait(false);
+                var result = await Record.ExceptionAsync(async () => await sut.PopToRootPage()).ConfigureAwait(true);
 
                 // Then
                 result.Should().BeOfType<InvalidOperationException>().Which.Message.Should().Be("Stack is empty.");
@@ -425,7 +425,7 @@ public async Task Should_Clear_Navigation_Stack()
             public async Task Should_Return_Single_Notification()
             {
                 // Given
-                int count = 0;
+                var count = 0;
                 ViewStackService sut = new ViewStackServiceFixture();
                 await sut.PushPage(new NavigableViewModelMock(), pages: 3);
 
@@ -602,7 +602,7 @@ public async Task Should_Throw_If_View_Model_Null()
                 ViewStackService sut = new ViewStackServiceFixture();
 
                 // When
-                var result = await Record.ExceptionAsync(async () => await sut.PushModal(null!)).ConfigureAwait(false);
+                var result = await Record.ExceptionAsync(async () => await sut.PushModal(null!)).ConfigureAwait(true);
 
                 // Then
                 result.Should().BeOfType<ArgumentNullException>();
@@ -637,7 +637,7 @@ public async Task Should_Throw_If_View_Model_Null()
                 // When
                 var result =
                     await Record.ExceptionAsync(async () => await sut.PushModal<NullViewModelMock>())
-                        .ConfigureAwait(false);
+                        .ConfigureAwait(true);
 
                 // Then
                 result.Should().BeOfType<ArgumentNullException>().Which.ParamName.Should().Be("modal");
@@ -672,7 +672,7 @@ public async Task Should_Call_ViewModel_Factory()
                 var factory = Substitute.For<IViewModelFactory>();
                 factory.Create<NavigableViewModelMock>(Arg.Any<string?>()).Returns(new NavigableViewModelMock());
                 var navigationParameter = Substitute.For<INavigationParameter>();
-                ParameterViewStackService sut = new ParameterViewStackServiceFixture().WithFactory(factory);
+                var sut = new ParameterViewStackServiceFixture().WithFactory(factory);
 
                 // When
                 await sut.PushModal<NavigableViewModelMock>(navigationParameter);
@@ -698,7 +698,7 @@ public async Task Should_Throw_If_View_Model_Null()
                 ViewStackService sut = new ViewStackServiceFixture();
 
                 // When
-                var result = await Record.ExceptionAsync(async () => await sut.PushPage(null!)).ConfigureAwait(false);
+                var result = await Record.ExceptionAsync(async () => await sut.PushPage(null!)).ConfigureAwait(true);
 
                 // Then
                 result.Should().BeOfType<ArgumentNullException>().Which.ParamName.Should().Be("viewModel");
@@ -806,7 +806,7 @@ public async Task Should_Throw_If_View_Model_Null()
                 // When
                 var result =
                     await Record.ExceptionAsync(async () => await sut.PushPage<NullViewModelMock>())
-                        .ConfigureAwait(false);
+                        .ConfigureAwait(true);
 
                 // Then
                 result.Should().BeOfType<ArgumentNullException>().Which.ParamName.Should().Be("viewModel");
@@ -841,7 +841,7 @@ public async Task Should_Call_ViewModel_Factory()
                 var factory = Substitute.For<IViewModelFactory>();
                 factory.Create<NavigableViewModelMock>(Arg.Any<string?>()).Returns(new NavigableViewModelMock());
                 var navigationParameter = Substitute.For<INavigationParameter>();
-                ParameterViewStackService sut = new ParameterViewStackServiceFixture().WithFactory(factory);
+                var sut = new ParameterViewStackServiceFixture().WithFactory(factory);
 
                 // When
                 await sut.PushPage<NavigableViewModelMock>(navigationParameter);
@@ -905,7 +905,7 @@ public async Task Should_Throw_If_Stack_Empty()
                 ViewStackService sut = new ViewStackServiceFixture();
 
                 // When
-                var result = await Record.ExceptionAsync(async () => await sut.TopModal()).ConfigureAwait(false);
+                var result = await Record.ExceptionAsync(async () => await sut.TopModal()).ConfigureAwait(true);
 
                 // Then
                 result.Should().BeOfType<ArgumentOutOfRangeException>().Which.ParamName.Should().Be("index");
@@ -966,7 +966,7 @@ public async Task Should_Throw_If_Stack_Empty()
                 ViewStackService sut = new ViewStackServiceFixture();
 
                 // When
-                var result = await Record.ExceptionAsync(async () => await sut.TopPage()).ConfigureAwait(false);
+                var result = await Record.ExceptionAsync(async () => await sut.TopPage()).ConfigureAwait(true);
 
                 // Then
                 result.Should().BeOfType<ArgumentOutOfRangeException>().Which.ParamName.Should().Be("index");
diff --git a/src/Sextant.Tests/Sextant.Tests.csproj b/src/Sextant.Tests/Sextant.Tests.csproj
index 2c5ac019..7d568b74 100644
--- a/src/Sextant.Tests/Sextant.Tests.csproj
+++ b/src/Sextant.Tests/Sextant.Tests.csproj
@@ -1,6 +1,6 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <LangVersion>latest</LangVersion>    
     <Nullable>enable</Nullable>    
diff --git a/src/Sextant.XamForms.Tests.zip b/src/Sextant.XamForms.Tests.zip
new file mode 100644
index 00000000..e8da5bee
--- /dev/null
+++ b/src/Sextant.XamForms.Tests.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c9fdb309a9dfa8013e6148ae5f8eef3ba643ba18c5301b165d9d20db73e277c6
+size 9848
diff --git a/src/Sextant.XamForms.Tests/API/ApiApprovalTests.SextantXamForms.net5.0.approved.txt b/src/Sextant.XamForms.Tests/API/ApiApprovalTests.SextantXamForms.net5.0.approved.txt
deleted file mode 100644
index 1ffaecca..00000000
--- a/src/Sextant.XamForms.Tests/API/ApiApprovalTests.SextantXamForms.net5.0.approved.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-[assembly: System.Reflection.AssemblyMetadata("RepositoryUrl", "https://github.com/reactiveui/sextant")]
-[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v5.0", FrameworkDisplayName="")]
-namespace Sextant.XamForms
-{
-    public abstract class BehaviorBase<T> : Xamarin.Forms.Behavior<T>, System.IDisposable
-        where T : Xamarin.Forms.BindableObject
-    {
-        protected BehaviorBase() { }
-        protected System.Reactive.Disposables.CompositeDisposable BehaviorDisposable { get; }
-        public void Dispose() { }
-        protected virtual void Dispose(bool disposing) { }
-        protected override void OnAttachedTo(T bindable) { }
-        protected override void OnDetachingFrom(T bindable) { }
-    }
-    public static class DependencyResolverMixins
-    {
-        public static string NavigationView { get; }
-        public static Sextant.XamForms.NavigationView? GetNavigationView(this Splat.IReadonlyDependencyResolver dependencyResolver, string? contract = null) { }
-        public static Splat.IMutableDependencyResolver RegisterNavigationView(this Splat.IMutableDependencyResolver dependencyResolver) { }
-        public static Splat.IMutableDependencyResolver RegisterNavigationView(this Splat.IMutableDependencyResolver dependencyResolver, System.Reactive.Concurrency.IScheduler mainThreadScheduler, System.Reactive.Concurrency.IScheduler backgroundScheduler) { }
-        public static Splat.IMutableDependencyResolver RegisterNavigationView<TView>(this Splat.IMutableDependencyResolver dependencyResolver, System.Func<TView> navigationViewFactory)
-            where TView : Sextant.IView { }
-    }
-    public sealed class NavigationPageSystemPopBehavior : Sextant.XamForms.BehaviorBase<Xamarin.Forms.NavigationPage>
-    {
-        public NavigationPageSystemPopBehavior(System.IObservable<Sextant.XamForms.NavigationSource> navigationSource) { }
-        protected override void OnAttachedTo(Xamarin.Forms.NavigationPage bindable) { }
-    }
-    public enum NavigationSource
-    {
-        Device = 0,
-        NavigationService = 1,
-    }
-    public class NavigationView : Xamarin.Forms.NavigationPage, Sextant.IView, Splat.IEnableLogger
-    {
-        public NavigationView() { }
-        public NavigationView(System.Reactive.Concurrency.IScheduler mainScheduler, System.Reactive.Concurrency.IScheduler backgroundScheduler, ReactiveUI.IViewLocator viewLocator) { }
-        public NavigationView(System.Reactive.Concurrency.IScheduler mainScheduler, System.Reactive.Concurrency.IScheduler backgroundScheduler, ReactiveUI.IViewLocator viewLocator, Xamarin.Forms.Page rootPage) { }
-        public System.Reactive.Concurrency.IScheduler MainThreadScheduler { get; }
-        public System.IObservable<Sextant.IViewModel> PagePopped { get; }
-        public System.IObservable<System.Reactive.Unit> PopModal() { }
-        public System.IObservable<System.Reactive.Unit> PopPage(bool animate) { }
-        public System.IObservable<System.Reactive.Unit> PopToRootPage(bool animate) { }
-        public System.IObservable<System.Reactive.Unit> PushModal(Sextant.IViewModel modalViewModel, string? contract, bool withNavigationPage = true) { }
-        public System.IObservable<System.Reactive.Unit> PushPage(Sextant.IViewModel viewModel, string? contract, bool resetStack, bool animate) { }
-    }
-    public static class SextantExtensions
-    {
-        public static void InitializeForms(this Sextant.Sextant sextant) { }
-    }
-}
\ No newline at end of file
diff --git a/src/Sextant.XamForms.Tests/API/ApiApprovalTests.SextantXamForms.net6.0.approved.txt b/src/Sextant.XamForms.Tests/API/ApiApprovalTests.SextantXamForms.net6.0.approved.txt
deleted file mode 100644
index 61c0e003..00000000
--- a/src/Sextant.XamForms.Tests/API/ApiApprovalTests.SextantXamForms.net6.0.approved.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-[assembly: System.Reflection.AssemblyMetadata("RepositoryUrl", "https://github.com/reactiveui/sextant")]
-[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v6.0", FrameworkDisplayName=".NET 6.0")]
-namespace Sextant.XamForms
-{
-    public abstract class BehaviorBase<T> : Xamarin.Forms.Behavior<T>, System.IDisposable
-        where T : Xamarin.Forms.BindableObject
-    {
-        protected BehaviorBase() { }
-        protected System.Reactive.Disposables.CompositeDisposable BehaviorDisposable { get; }
-        public void Dispose() { }
-        protected virtual void Dispose(bool disposing) { }
-        protected override void OnAttachedTo(T bindable) { }
-        protected override void OnDetachingFrom(T bindable) { }
-    }
-    public static class DependencyResolverMixins
-    {
-        public static string NavigationView { get; }
-        public static Sextant.XamForms.NavigationView? GetNavigationView(this Splat.IReadonlyDependencyResolver dependencyResolver, string? contract = null) { }
-        public static Splat.IMutableDependencyResolver RegisterNavigationView(this Splat.IMutableDependencyResolver dependencyResolver) { }
-        public static Splat.IMutableDependencyResolver RegisterNavigationView(this Splat.IMutableDependencyResolver dependencyResolver, System.Reactive.Concurrency.IScheduler mainThreadScheduler, System.Reactive.Concurrency.IScheduler backgroundScheduler) { }
-        public static Splat.IMutableDependencyResolver RegisterNavigationView<TView>(this Splat.IMutableDependencyResolver dependencyResolver, System.Func<TView> navigationViewFactory)
-            where TView : Sextant.IView { }
-    }
-    public sealed class NavigationPageSystemPopBehavior : Sextant.XamForms.BehaviorBase<Xamarin.Forms.NavigationPage>
-    {
-        public NavigationPageSystemPopBehavior(System.IObservable<Sextant.XamForms.NavigationSource> navigationSource) { }
-        protected override void OnAttachedTo(Xamarin.Forms.NavigationPage bindable) { }
-    }
-    public enum NavigationSource
-    {
-        Device = 0,
-        NavigationService = 1,
-    }
-    public class NavigationView : Xamarin.Forms.NavigationPage, Sextant.IView, Splat.IEnableLogger, System.IDisposable
-    {
-        public NavigationView() { }
-        public NavigationView(System.Reactive.Concurrency.IScheduler mainScheduler, System.Reactive.Concurrency.IScheduler backgroundScheduler, ReactiveUI.IViewLocator viewLocator) { }
-        public NavigationView(System.Reactive.Concurrency.IScheduler mainScheduler, System.Reactive.Concurrency.IScheduler backgroundScheduler, ReactiveUI.IViewLocator viewLocator, Xamarin.Forms.Page rootPage) { }
-        public System.Reactive.Concurrency.IScheduler MainThreadScheduler { get; }
-        public System.IObservable<Sextant.IViewModel> PagePopped { get; }
-        public void Dispose() { }
-        protected virtual void Dispose(bool disposing) { }
-        public System.IObservable<System.Reactive.Unit> PopModal() { }
-        public System.IObservable<System.Reactive.Unit> PopPage(bool animate) { }
-        public System.IObservable<System.Reactive.Unit> PopToRootPage(bool animate) { }
-        public System.IObservable<System.Reactive.Unit> PushModal(Sextant.IViewModel modalViewModel, string? contract, bool withNavigationPage = true) { }
-        public System.IObservable<System.Reactive.Unit> PushPage(Sextant.IViewModel viewModel, string? contract, bool resetStack, bool animate) { }
-    }
-    public static class SextantExtensions
-    {
-        public static void InitializeForms(this Sextant.Sextant sextant) { }
-    }
-}
\ No newline at end of file
diff --git a/src/Sextant.XamForms.Tests/API/ApiApprovalTests.SextantXamForms.netcoreapp3.1.approved.txt b/src/Sextant.XamForms.Tests/API/ApiApprovalTests.SextantXamForms.netcoreapp3.1.approved.txt
deleted file mode 100644
index 95387992..00000000
--- a/src/Sextant.XamForms.Tests/API/ApiApprovalTests.SextantXamForms.netcoreapp3.1.approved.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-[assembly: System.Reflection.AssemblyMetadata("RepositoryUrl", "https://github.com/reactiveui/sextant")]
-[assembly: System.Runtime.Versioning.TargetFramework(".NETStandard,Version=v2.0", FrameworkDisplayName="")]
-namespace Sextant.XamForms
-{
-    public abstract class BehaviorBase<T> : Xamarin.Forms.Behavior<T>, System.IDisposable
-        where T : Xamarin.Forms.BindableObject
-    {
-        protected BehaviorBase() { }
-        protected System.Reactive.Disposables.CompositeDisposable BehaviorDisposable { get; }
-        public void Dispose() { }
-        protected virtual void Dispose(bool disposing) { }
-        protected override void OnAttachedTo(T bindable) { }
-        protected override void OnDetachingFrom(T bindable) { }
-    }
-    public static class DependencyResolverMixins
-    {
-        public static string NavigationView { get; }
-        public static Sextant.XamForms.NavigationView? GetNavigationView(this Splat.IReadonlyDependencyResolver dependencyResolver, string? contract = null) { }
-        public static Splat.IMutableDependencyResolver RegisterNavigationView(this Splat.IMutableDependencyResolver dependencyResolver) { }
-        public static Splat.IMutableDependencyResolver RegisterNavigationView(this Splat.IMutableDependencyResolver dependencyResolver, System.Reactive.Concurrency.IScheduler mainThreadScheduler, System.Reactive.Concurrency.IScheduler backgroundScheduler) { }
-        public static Splat.IMutableDependencyResolver RegisterNavigationView<TView>(this Splat.IMutableDependencyResolver dependencyResolver, System.Func<TView> navigationViewFactory)
-            where TView : Sextant.IView { }
-    }
-    public sealed class NavigationPageSystemPopBehavior : Sextant.XamForms.BehaviorBase<Xamarin.Forms.NavigationPage>
-    {
-        public NavigationPageSystemPopBehavior(System.IObservable<Sextant.XamForms.NavigationSource> navigationSource) { }
-        protected override void OnAttachedTo(Xamarin.Forms.NavigationPage bindable) { }
-    }
-    public enum NavigationSource
-    {
-        Device = 0,
-        NavigationService = 1,
-    }
-    public class NavigationView : Xamarin.Forms.NavigationPage, Sextant.IView, Splat.IEnableLogger
-    {
-        public NavigationView() { }
-        public NavigationView(System.Reactive.Concurrency.IScheduler mainScheduler, System.Reactive.Concurrency.IScheduler backgroundScheduler, ReactiveUI.IViewLocator viewLocator) { }
-        public NavigationView(System.Reactive.Concurrency.IScheduler mainScheduler, System.Reactive.Concurrency.IScheduler backgroundScheduler, ReactiveUI.IViewLocator viewLocator, Xamarin.Forms.Page rootPage) { }
-        public System.Reactive.Concurrency.IScheduler MainThreadScheduler { get; }
-        public System.IObservable<Sextant.IViewModel> PagePopped { get; }
-        public System.IObservable<System.Reactive.Unit> PopModal() { }
-        public System.IObservable<System.Reactive.Unit> PopPage(bool animate) { }
-        public System.IObservable<System.Reactive.Unit> PopToRootPage(bool animate) { }
-        public System.IObservable<System.Reactive.Unit> PushModal(Sextant.IViewModel modalViewModel, string? contract, bool withNavigationPage = true) { }
-        public System.IObservable<System.Reactive.Unit> PushPage(Sextant.IViewModel viewModel, string? contract, bool resetStack, bool animate) { }
-    }
-    public static class SextantExtensions
-    {
-        public static void InitializeForms(this Sextant.Sextant sextant) { }
-    }
-}
\ No newline at end of file
diff --git a/src/Sextant.XamForms.Tests/API/ApiApprovalTests.cs b/src/Sextant.XamForms.Tests/API/ApiApprovalTests.cs
deleted file mode 100644
index 31af7123..00000000
--- a/src/Sextant.XamForms.Tests/API/ApiApprovalTests.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for full license information.
-
-using System;
-using System.Diagnostics.CodeAnalysis;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Text.RegularExpressions;
-using DiffEngine;
-using PublicApiGenerator;
-using Splat;
-using Xunit;
-
-namespace Sextant.XamForms.Tests
-{
-    /// <summary>
-    /// Tests to make sure that the API matches the approved ones.
-    /// </summary>
-    [ExcludeFromCodeCoverage]
-    public class ApiApprovalTests
-    {
-        private static readonly Regex _removeCoverletSectionRegex = new(@"^namespace Coverlet\.Core\.Instrumentation\.Tracker.*?^}", RegexOptions.Singleline | RegexOptions.Multiline | RegexOptions.Compiled);
-
-        /// <summary>
-        /// Tests to make sure the splat project is approved.
-        /// </summary>
-        [Fact]
-        public void SextantXamForms() => CheckApproval(typeof(NavigationView).Assembly);
-
-        private static void CheckApproval(Assembly assembly, [CallerMemberName]string? memberName = null, [CallerFilePath]string? filePath = null)
-        {
-            var targetFrameworkName = Assembly.GetExecutingAssembly().GetTargetFrameworkName();
-
-            var sourceDirectory = Path.GetDirectoryName(filePath);
-
-            if (sourceDirectory is null)
-            {
-                throw new ArgumentException("The directory name is empty for path: " + filePath);
-            }
-
-            var approvedFileName = Path.Combine(sourceDirectory, $"ApiApprovalTests.{memberName}.{targetFrameworkName}.approved.txt");
-            var receivedFileName = Path.Combine(sourceDirectory, $"ApiApprovalTests.{memberName}.{targetFrameworkName}.received.txt");
-
-            if (!File.Exists(receivedFileName))
-            {
-                File.Create(receivedFileName);
-            }
-
-            if (!File.Exists(approvedFileName))
-            {
-                File.Create(approvedFileName);
-            }
-
-            var approvedPublicApi = File.ReadAllText(approvedFileName);
-
-            var receivedPublicApi = Filter(assembly.GeneratePublicApi());
-
-            if (!string.Equals(receivedPublicApi, approvedPublicApi, StringComparison.InvariantCulture))
-            {
-                File.WriteAllText(receivedFileName, receivedPublicApi);
-                DiffRunner.Launch(receivedFileName, approvedFileName);
-            }
-
-            Assert.Equal(approvedPublicApi, receivedPublicApi);
-        }
-
-        private static string Filter(string text)
-        {
-            text = _removeCoverletSectionRegex.Replace(text, string.Empty);
-            return string.Join(Environment.NewLine, text.Split(
-                new[]
-                {
-                    Environment.NewLine
-                },
-                StringSplitOptions.RemoveEmptyEntries)
-                    .Where(l =>
-                    !l.StartsWith("[assembly: AssemblyVersion(", StringComparison.InvariantCulture) &&
-                    !l.StartsWith("[assembly: AssemblyFileVersion(", StringComparison.InvariantCulture) &&
-                    !l.StartsWith("[assembly: AssemblyInformationalVersion(", StringComparison.InvariantCulture) &&
-                    !string.IsNullOrWhiteSpace(l)));
-        }
-    }
-}
diff --git a/src/Sextant.XamForms.Tests/Behaviors/NavigationPageSystemPopBehaviorTests.cs b/src/Sextant.XamForms.Tests/Behaviors/NavigationPageSystemPopBehaviorTests.cs
deleted file mode 100644
index b0ba90fb..00000000
--- a/src/Sextant.XamForms.Tests/Behaviors/NavigationPageSystemPopBehaviorTests.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for full license information.
-
-using System.Reactive.Subjects;
-using System.Threading.Tasks;
-using NSubstitute;
-using Sextant.Mocks;
-using Xamarin.Forms;
-using Xunit;
-
-namespace Sextant.XamForms.Tests
-{
-    /// <summary>
-    /// Tests navigation page system pop behavior.
-    /// </summary>
-    public class NavigationPageSystemPopBehaviorTests
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="NavigationPageSystemPopBehaviorTests"/> class.
-        /// </summary>
-        public NavigationPageSystemPopBehaviorTests()
-        {
-            Xamarin.Forms.Mocks.MockForms.Init();
-        }
-
-        /// <summary>
-        /// Tests that popping a page calls WhenNavigatedFrom.
-        /// </summary>
-        /// <returns>A completion notification.</returns>
-        [Fact]
-        public async Task Should_Call_Navigated_From()
-        {
-            // Given
-            var source = new BehaviorSubject<NavigationSource>(NavigationSource.Device);
-            var viewModel = Substitute.For<INavigated>();
-            var navigationPage = new NavigationPage();
-            NavigationPageSystemPopBehavior sut = new(source);
-            navigationPage.Behaviors.Add(sut);
-
-            // When
-            await navigationPage.PushAsync(new Page()).ConfigureAwait(true);
-            await navigationPage.PushAsync(new Page { BindingContext = viewModel }).ConfigureAwait(true);
-            await navigationPage.PopAsync().ConfigureAwait(true);
-
-            // Then
-            viewModel.Received(1).WhenNavigatedFrom(Arg.Any<INavigationParameter>());
-        }
-
-        /// <summary>
-        /// Tests that popping a page calls Destroy.
-        /// </summary>
-        /// <returns>A completion notification.</returns>
-        [Fact]
-        public async Task Should_Call_Destroy()
-        {
-            // Given
-            var source = new BehaviorSubject<NavigationSource>(NavigationSource.Device);
-            var viewModel = Substitute.For<IDestructible>();
-            var navigationPage = new NavigationPage();
-            NavigationPageSystemPopBehavior sut = new(source);
-            navigationPage.Behaviors.Add(sut);
-
-            // When
-            await navigationPage.PushAsync(new Page()).ConfigureAwait(true);
-            await navigationPage.PushAsync(new Page { BindingContext = viewModel }).ConfigureAwait(true);
-            await navigationPage.PopAsync().ConfigureAwait(true);
-
-            // Then
-            viewModel.Received(1).Destroy();
-        }
-
-        /// <summary>
-        /// Tests that popping a page calls WhenNavigatedTo.
-        /// </summary>
-        /// <returns>A completion notification.</returns>
-        [Fact]
-        public async Task Should_Call_WhenNavigatedTo()
-        {
-            // Given
-            var source = new BehaviorSubject<NavigationSource>(NavigationSource.Device);
-            var viewModel = Substitute.For<INavigated>();
-            var navigationPage = new NavigationPage();
-            NavigationPageSystemPopBehavior sut = new(source);
-            navigationPage.Behaviors.Add(sut);
-
-            // When
-            await navigationPage.PushAsync(new Page { BindingContext = viewModel }).ConfigureAwait(true);
-            await navigationPage.PushAsync(new Page()).ConfigureAwait(true);
-            await navigationPage.PopAsync().ConfigureAwait(true);
-
-            // Then
-            viewModel.Received(1).WhenNavigatedTo(Arg.Any<INavigationParameter>());
-        }
-
-        /// <summary>
-        /// Tests that popping a page executes subscription when NavigationSource is Device.
-        /// </summary>
-        /// <returns>A completion notification.</returns>
-        [Fact]
-        public async Task Should_Not_Execute_When_Navigation_Service_Pop()
-        {
-            // Given
-            var source = new BehaviorSubject<NavigationSource>(NavigationSource.NavigationService);
-            var viewModel1 = Substitute.For<IEverything>();
-            var viewModel2 = Substitute.For<INavigated>();
-            var navigationPage = new NavigationPage();
-            NavigationPageSystemPopBehavior sut = new(source);
-            navigationPage.Behaviors.Add(sut);
-
-            // When
-            await navigationPage.PushAsync(new Page { BindingContext = viewModel1 }).ConfigureAwait(true);
-            await navigationPage.PushAsync(new Page { BindingContext = viewModel2 }).ConfigureAwait(true);
-            await navigationPage.PopAsync().ConfigureAwait(true);
-
-            // Then
-            viewModel1.DidNotReceive().WhenNavigatedTo(Arg.Any<INavigationParameter>());
-            viewModel2.DidNotReceive().WhenNavigatedFrom(Arg.Any<INavigationParameter>());
-            viewModel1.DidNotReceive().Destroy();
-        }
-    }
-}
diff --git a/src/Sextant.XamForms.Tests/DependencyResolverMixinTests.cs b/src/Sextant.XamForms.Tests/DependencyResolverMixinTests.cs
deleted file mode 100644
index 1a8db59e..00000000
--- a/src/Sextant.XamForms.Tests/DependencyResolverMixinTests.cs
+++ /dev/null
@@ -1,214 +0,0 @@
-// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for full license information.
-
-using FluentAssertions;
-using ReactiveUI;
-using Sextant.Mocks;
-using Splat;
-using Xamarin.Forms;
-using Xunit;
-
-namespace Sextant.XamForms.Tests
-{
-    /// <summary>
-    /// Tests the IMutableDependencyResolver extension class.
-    /// </summary>
-    public sealed class DependencyResolverMixinTests
-    {
-        /// <summary>
-        /// Tests the register navigation view method.
-        /// </summary>
-        public sealed class TheRegisterNavigationViewMethod
-        {
-            /// <summary>
-            /// Should register the navigation view.
-            /// </summary>
-            [Fact]
-            public void Should_Register_Navigation_View()
-            {
-                // Given
-                Locator.CurrentMutable.RegisterNavigationView();
-
-                // When
-                var result = Locator.Current.GetService<IView>(DependencyResolverMixins.NavigationView);
-
-                // Then
-                result.Should().BeOfType<NavigationView>();
-            }
-
-            /// <summary>
-            /// Should register the navigation view.
-            /// </summary>
-            [Fact]
-            public void Should_Register_Navigation_View_With_Schedulers()
-            {
-                // Given
-                Locator.CurrentMutable.RegisterNavigationView(RxApp.MainThreadScheduler, RxApp.TaskpoolScheduler);
-
-                // When
-                var result = Locator.Current.GetService<IView>(DependencyResolverMixins.NavigationView);
-
-                // Then
-                result.Should().BeOfType<NavigationView>();
-            }
-        }
-
-        /// <summary>
-        /// Tests the register navigation method.
-        /// </summary>
-        public sealed class TheRegisterNavigationViewFunctionMethod
-        {
-            /// <summary>
-            /// Should register the view stack service.
-            /// </summary>
-            [Fact]
-            public void Should_Register_Navigation_View()
-            {
-                // Given
-                Locator.CurrentMutable.RegisterViewModelFactory();
-                Locator.CurrentMutable.RegisterNavigationView(() => new NavigationView(RxApp.MainThreadScheduler, RxApp.TaskpoolScheduler, ViewLocator.Current));
-
-                // When
-                var result = Locator.Current.GetService<IView>(DependencyResolverMixins.NavigationView);
-
-                // Then
-                result.Should().BeOfType<NavigationView>();
-            }
-        }
-
-        /// <summary>
-        /// Tests the register view stack service method.
-        /// </summary>
-        public sealed class TheRegisterViewStackServiceMethod
-        {
-            /// <summary>
-            /// Initializes a new instance of the <see cref="TheRegisterViewStackServiceMethod"/> class.
-            /// </summary>
-            public TheRegisterViewStackServiceMethod()
-            {
-                Locator.CurrentMutable.UnregisterAll<IView>();
-                Locator.CurrentMutable.UnregisterAll<IViewStackService>();
-                Locator.CurrentMutable.UnregisterAll<IViewModelFactory>();
-                Locator.CurrentMutable.UnregisterAll<IParameterViewStackService>();
-            }
-
-            /// <summary>
-            /// Should register the view stack service.
-            /// </summary>
-            [Fact]
-            public void Should_Register_View_Stack_Service()
-            {
-                // Given
-                Locator.CurrentMutable.RegisterNavigationView();
-                Locator.CurrentMutable.RegisterViewModelFactory();
-                Locator.CurrentMutable.RegisterViewStackService();
-
-                // When
-                var result = Locator.Current.GetService<IViewStackService>();
-
-                // Then
-                result.Should().BeOfType<ParameterViewStackService>();
-            }
-
-            /// <summary>
-            /// Tests the view stack service overload.
-            /// </summary>
-            [Fact]
-            public void Should_Register_View_Stack_Service_With_View()
-            {
-                // Given
-                Locator.CurrentMutable.RegisterNavigationView();
-                Locator.CurrentMutable.RegisterViewModelFactory();
-                Locator.CurrentMutable.RegisterViewStackService<IViewStackService>(view => new ParameterViewStackService(view));
-
-                // When
-                var result = Locator.Current.GetService<IViewStackService>();
-
-                // Then
-                result.Should().BeOfType<ParameterViewStackService>();
-            }
-
-            /// <summary>
-            /// Tests the view stack service overload.
-            /// </summary>
-            [Fact]
-            public void Should_Register_View_Stack_Service_With_Factory()
-            {
-                // Given
-                Locator.CurrentMutable.RegisterNavigationView();
-                Locator.CurrentMutable.RegisterViewModelFactory();
-                Locator.CurrentMutable.RegisterViewStackService<IViewStackService>((view, factory) => new ParameterViewStackService(view, factory));
-
-                // When
-                var result = Locator.Current.GetService<IViewStackService>();
-
-                // Then
-                result.Should().BeOfType<ParameterViewStackService>();
-            }
-        }
-
-        /// <summary>
-        /// Tests the register view method.
-        /// </summary>
-        public sealed class TheRegisterViewMethod
-        {
-            /// <summary>
-            /// Should register the view stack service.
-            /// </summary>
-            [Fact]
-            public void Should_Register_View()
-            {
-                // Given
-                Locator.CurrentMutable.RegisterView<PageView, NavigableViewModelMock>();
-
-                // When
-                var result = Locator.Current.GetService<IViewFor<NavigableViewModelMock>>();
-
-                // Then
-                result.Should().BeOfType<PageView>();
-            }
-
-            /// <summary>
-            /// Should register the view stack service factory.
-            /// </summary>
-            [Fact]
-            public void Should_Register_View_Factory()
-            {
-                // Given
-                Locator.CurrentMutable.RegisterView<PageView, NavigableViewModelMock>(() => new PageView());
-
-                // When
-                var result = Locator.Current.GetService<IViewFor<NavigableViewModelMock>>();
-
-                // Then
-                result.Should().BeOfType<PageView>();
-            }
-        }
-
-        /// <summary>
-        /// Tests the get navigation view method.
-        /// </summary>
-        public sealed class TheGetNavigationView
-        {
-            /// <summary>
-            /// Should register the view stack service.
-            /// </summary>
-            [Fact]
-            public void Should_Return_Navigation_View()
-            {
-                // Given
-                Locator.CurrentMutable.RegisterNavigationView();
-
-                // When
-                var result = Locator.Current.GetNavigationView();
-
-                // Then
-                result.Should().BeAssignableTo<IView>();
-                result.Should().BeAssignableTo<Page>();
-                result.Should().BeAssignableTo<NavigationPage>();
-            }
-        }
-    }
-}
diff --git a/src/Sextant.XamForms.Tests/Sextant.XamForms.Tests.csproj b/src/Sextant.XamForms.Tests/Sextant.XamForms.Tests.csproj
deleted file mode 100644
index 16fdf914..00000000
--- a/src/Sextant.XamForms.Tests/Sextant.XamForms.Tests.csproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<Project Sdk="MSBuild.Sdk.Extras">
-  <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
-    <IsPackable>false</IsPackable>
-    <Nullable>enable</Nullable>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <Content Include="..\xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Sextant.Mocks\Sextant.Mocks.csproj" />
-    <ProjectReference Include="..\Sextant.XamForms\Sextant.XamForms.csproj" />
-    <ProjectReference Include="..\Sextant\Sextant.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Update="Behaviors\NavigationPageSystemPopBehaviorTests.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/Sextant.XamForms.Tests/SextantExtensionTests.cs b/src/Sextant.XamForms.Tests/SextantExtensionTests.cs
deleted file mode 100644
index f41e80b4..00000000
--- a/src/Sextant.XamForms.Tests/SextantExtensionTests.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for full license information.
-
-using FluentAssertions;
-using Splat;
-using Xunit;
-
-namespace Sextant.XamForms.Tests
-{
-    /// <summary>
-    /// Tests <see cref="Sextant"/> initialization methods.
-    /// </summary>
-    public sealed class SextantExtensionTests
-    {
-        /// <summary>
-        /// Tests the Sextant Initialize Forms method.
-        /// </summary>
-        public sealed class TheInitializeFormsMethod
-        {
-            /// <summary>
-            /// Tests the navigation view is registered.
-            /// </summary>
-            [Fact]
-            public void Should_Register_Navigation_View()
-            {
-                // Given
-                Sextant.Instance.InitializeForms();
-
-                // When
-                var result = Locator.Current.GetService<IView>(nameof(NavigationView));
-
-                // Then
-                result.Should().BeOfType<NavigationView>();
-            }
-
-            /// <summary>
-            /// Tests the navigation view is registered.
-            /// </summary>
-            [Fact]
-            public void Should_Register_View_Stack_Service()
-            {
-                // Given
-                Sextant.Instance.InitializeForms();
-
-                // When
-                var result = Locator.Current.GetService<IViewStackService>();
-
-                // Then
-                result.Should().BeOfType<ParameterViewStackService>();
-            }
-
-            /// <summary>
-            /// Tests the navigation view is registered.
-            /// </summary>
-            [Fact]
-            public void Should_Register_Default_View_Model_Factory()
-            {
-                // Given
-                Sextant.Instance.InitializeForms();
-
-                // When
-                var result = ViewModelFactory.Current;
-
-                // Then
-                result.Should().BeAssignableTo<IViewModelFactory>();
-            }
-        }
-    }
-}
diff --git a/src/Sextant.XamForms/Behaviors/BehaviorBase.cs b/src/Sextant.XamForms/Behaviors/BehaviorBase.cs
deleted file mode 100644
index 682f406b..00000000
--- a/src/Sextant.XamForms/Behaviors/BehaviorBase.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for full license information.
-
-using System;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-using Xamarin.Forms;
-
-namespace Sextant.XamForms;
-
-/// <summary>
-/// Represents and abstract <see cref="Behavior{T}"/>.
-/// </summary>
-/// <typeparam name="T">The bindable object type.
-/// </typeparam>
-public abstract class BehaviorBase<T> : Behavior<T>, IDisposable
-    where T : BindableObject
-{
-    /// <summary>
-    /// Gets the disposables for this behavior.
-    /// </summary>
-    protected CompositeDisposable BehaviorDisposable { get; } = [];
-
-    /// <inheritdoc/>
-    public void Dispose()
-    {
-        Dispose(true);
-        GC.SuppressFinalize(this);
-    }
-
-    /// <inheritdoc/>
-    protected override void OnAttachedTo(T bindable)
-    {
-        base.OnAttachedTo(bindable);
-        Observable.FromEvent<EventHandler, EventArgs>(
-                handler =>
-                {
-                    void Handler(object sender, EventArgs args) => handler(args);
-                    return Handler!;
-                },
-                x => bindable.BindingContextChanged += x,
-                x => bindable.BindingContextChanged -= x)
-            .Subscribe(_ => BindingContext = bindable.BindingContext)
-            .DisposeWith(BehaviorDisposable);
-    }
-
-    /// <inheritdoc/>
-    protected override void OnDetachingFrom(T bindable)
-    {
-        base.OnDetachingFrom(bindable);
-        Dispose();
-    }
-
-    /// <summary>
-    /// Disposes of resources.
-    /// </summary>
-    /// <param name="disposing">A value indicating where this instance is disposing.</param>
-    protected virtual void Dispose(bool disposing)
-    {
-        if (disposing)
-        {
-            BehaviorDisposable.Dispose();
-        }
-    }
-}
diff --git a/src/Sextant.XamForms/Behaviors/NavigationPageSystemPopBehavior.cs b/src/Sextant.XamForms/Behaviors/NavigationPageSystemPopBehavior.cs
deleted file mode 100644
index 3295553c..00000000
--- a/src/Sextant.XamForms/Behaviors/NavigationPageSystemPopBehavior.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for full license information.
-
-using System;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-using Xamarin.Forms;
-
-namespace Sextant.XamForms;
-
-/// <summary>
-/// Represents a <see cref="BehaviorBase{T}"/> that intercepts the backwards navigation.
-/// </summary>
-/// <remarks>
-/// Initializes a new instance of the <see cref="NavigationPageSystemPopBehavior"/> class.
-/// </remarks>
-/// <param name="navigationSource">A value indicating whether the back button was pressed.</param>
-public sealed class NavigationPageSystemPopBehavior(IObservable<NavigationSource> navigationSource) : BehaviorBase<NavigationPage>
-{
-    /// <inheritdoc/>
-    protected override void OnAttachedTo(NavigationPage bindable)
-    {
-        Observable
-            .FromEvent<EventHandler<NavigationEventArgs>, NavigationEventArgs>(
-                handler =>
-                {
-                    void Handler(object sender, NavigationEventArgs args) => handler(args);
-                    return Handler!;
-                },
-                x => bindable.Popped += x,
-                x => bindable.Popped -= x)
-            .WithLatestFrom(navigationSource, (navigated, navigationSource) => (navigated, navigationSource))
-            .Where(result => result.navigationSource == NavigationSource.Device)
-            .Select(x => x.navigated)
-            .Subscribe(navigated =>
-            {
-                INavigationParameter navigationParameter = new NavigationParameter();
-
-                navigated
-                    .Page
-                    .BindingContext
-                    .InvokeViewModelAction<INavigated>(x =>
-                        x.WhenNavigatedFrom(navigationParameter)
-                            .Subscribe()
-                            .DisposeWith(BehaviorDisposable));
-
-                bindable
-                    .CurrentPage
-                    .BindingContext
-                    .InvokeViewModelAction<INavigated>(x =>
-                        x.WhenNavigatedTo(navigationParameter)
-                            .Subscribe()
-                            .DisposeWith(BehaviorDisposable));
-
-                navigated
-                    .Page
-                    .BindingContext
-                    .InvokeViewModelAction<IDestructible>(x => x.Destroy());
-            })
-            .DisposeWith(BehaviorDisposable);
-
-        base.OnAttachedTo(bindable);
-    }
-}
diff --git a/src/Sextant.XamForms/Mixins/DependencyResolverMixins.cs b/src/Sextant.XamForms/Mixins/DependencyResolverMixins.cs
deleted file mode 100644
index e4869bd7..00000000
--- a/src/Sextant.XamForms/Mixins/DependencyResolverMixins.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for full license information.
-
-using System;
-using System.Diagnostics.CodeAnalysis;
-using System.Reactive.Concurrency;
-using ReactiveUI;
-using Splat;
-
-namespace Sextant.XamForms;
-
-/// <summary>
-/// Extension methods associated with the IMutableDependencyResolver interface.
-/// </summary>
-public static class DependencyResolverMixins
-{
-    /// <summary>
-    /// Gets the navigation view key.
-    /// </summary>
-    [SuppressMessage("Design", "CA1721: Confusing name, should be method.", Justification = "Deliberate usage.")]
-    public static string NavigationView => nameof(NavigationView);
-
-    /// <summary>
-    /// Initializes the sextant.
-    /// </summary>
-    /// <param name="dependencyResolver">The dependency resolver.</param>
-    /// <returns>The dependencyResolver.</returns>
-    public static IMutableDependencyResolver RegisterNavigationView(this IMutableDependencyResolver dependencyResolver)
-    {
-        dependencyResolver.RegisterLazySingleton(
-            () => new NavigationView(
-                RxApp.MainThreadScheduler,
-                RxApp.TaskpoolScheduler,
-                Locator.Current.GetService<IViewLocator>() ?? throw new InvalidOperationException("IViewLocator not registered.")),
-            typeof(IView),
-            NavigationView);
-        return dependencyResolver;
-    }
-
-    /// <summary>
-    /// Initializes sextant.
-    /// </summary>
-    /// <param name="dependencyResolver">The dependency resolver.</param>
-    /// <param name="mainThreadScheduler">The main scheduler.</param>
-    /// <param name="backgroundScheduler">The background scheduler.</param>
-    /// <returns>The dependencyResolver.</returns>
-    public static IMutableDependencyResolver RegisterNavigationView(this IMutableDependencyResolver dependencyResolver, IScheduler mainThreadScheduler, IScheduler backgroundScheduler)
-    {
-        dependencyResolver.RegisterLazySingleton(
-            () => new NavigationView(
-                mainThreadScheduler,
-                backgroundScheduler,
-                Locator.Current.GetService<IViewLocator>() ?? throw new InvalidOperationException("IViewLocator not registered.")),
-            typeof(IView),
-            NavigationView);
-        return dependencyResolver;
-    }
-
-    /// <summary>
-    /// Registers a value for navigation.
-    /// </summary>
-    /// <typeparam name="TView">The type of view to register.</typeparam>
-    /// <param name="dependencyResolver">The dependency resolver.</param>
-    /// <param name="navigationViewFactory">The navigation view factory.</param>
-    /// <returns>The dependencyResolver.</returns>
-    [SuppressMessage("Reliability", "CA2000:Dispose objects before losing scope", Justification = "Long term object.")]
-    public static IMutableDependencyResolver RegisterNavigationView<TView>(this IMutableDependencyResolver dependencyResolver, Func<TView> navigationViewFactory)
-        where TView : IView
-    {
-        if (dependencyResolver is null)
-        {
-            throw new ArgumentNullException(nameof(dependencyResolver));
-        }
-
-        if (navigationViewFactory is null)
-        {
-            throw new ArgumentNullException(nameof(navigationViewFactory));
-        }
-
-        var navigationView = navigationViewFactory();
-        var viewStackService = new ViewStackService(navigationView);
-
-        dependencyResolver.RegisterLazySingleton<IViewStackService>(() => viewStackService);
-        dependencyResolver.RegisterLazySingleton<IView>(() => navigationView, NavigationView);
-        return dependencyResolver;
-    }
-
-    /// <summary>
-    /// Gets the navigation view.
-    /// </summary>
-    /// <param name="dependencyResolver">The dependency resolver.</param>
-    /// <param name="contract">The contract.</param>
-    /// <returns>The navigation view.</returns>
-    public static NavigationView? GetNavigationView(
-        this IReadonlyDependencyResolver dependencyResolver,
-        string? contract = null)
-    {
-        if (dependencyResolver is null)
-        {
-            throw new ArgumentNullException(nameof(dependencyResolver));
-        }
-
-        return dependencyResolver.GetService<IView>(contract ?? NavigationView) as NavigationView;
-    }
-}
diff --git a/src/Sextant.XamForms/Mixins/SextantExtensions.cs b/src/Sextant.XamForms/Mixins/SextantExtensions.cs
deleted file mode 100644
index 969f1196..00000000
--- a/src/Sextant.XamForms/Mixins/SextantExtensions.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for full license information.
-
-using System;
-
-namespace Sextant.XamForms;
-
-/// <summary>
-/// Extension methods interact with <see cref="Sextant"/>.
-/// </summary>
-public static class SextantExtensions
-{
-    /// <summary>
-    /// Initializes the sextant.
-    /// </summary>
-    /// <param name="sextant">The sextant.</param>
-    public static void InitializeForms(this Sextant sextant)
-    {
-        if (sextant is null)
-        {
-            throw new ArgumentNullException(nameof(sextant));
-        }
-
-        sextant
-            .MutableLocator
-            .RegisterNavigationView()
-            .RegisterViewStackService()
-            .RegisterParameterViewStackService()
-            .RegisterViewModelFactory(() => new DefaultViewModelFactory());
-    }
-}
diff --git a/src/Sextant.XamForms/NavigationSource.cs b/src/Sextant.XamForms/NavigationSource.cs
deleted file mode 100644
index 53eb6e10..00000000
--- a/src/Sextant.XamForms/NavigationSource.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for full license information.
-
-namespace Sextant.XamForms;
-
-/// <summary>
-/// An enumeration of where navigation signals are sent from.
-/// </summary>
-public enum NavigationSource
-{
-    /// <summary>
-    /// Navigation sourced from the device.
-    /// </summary>
-    Device,
-
-    /// <summary>
-    /// Navigation sourced from the service.
-    /// </summary>
-    NavigationService
-}
diff --git a/src/Sextant.XamForms/NavigationView.cs b/src/Sextant.XamForms/NavigationView.cs
deleted file mode 100644
index 9f7b834f..00000000
--- a/src/Sextant.XamForms/NavigationView.cs
+++ /dev/null
@@ -1,246 +0,0 @@
-// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for full license information.
-
-using System;
-using System.Reactive;
-using System.Reactive.Concurrency;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
-using System.Reactive.Threading.Tasks;
-using ReactiveUI;
-using Splat;
-using Xamarin.Forms;
-
-namespace Sextant.XamForms;
-
-/// <summary>
-/// The main navigation view.
-/// </summary>
-public class NavigationView : NavigationPage, IView, IEnableLogger, IDisposable
-{
-    private readonly BehaviorSubject<NavigationSource> _navigationSource = new(NavigationSource.Device);
-    private readonly IScheduler _backgroundScheduler;
-    private readonly IViewLocator _viewLocator;
-    private readonly IFullLogger _logger;
-    private bool _disposedValue;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="NavigationView"/> class.
-    /// </summary>
-    public NavigationView()
-        : this(RxApp.MainThreadScheduler, RxApp.TaskpoolScheduler, ViewLocator.Current)
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="NavigationView"/> class.
-    /// </summary>
-    /// <param name="mainScheduler">The main scheduler to scheduler UI tasks on.</param>
-    /// <param name="backgroundScheduler">The background scheduler.</param>
-    /// <param name="viewLocator">The view locator which will find views associated with view models.</param>
-    /// <param name="rootPage">The starting root page.</param>
-    public NavigationView(IScheduler mainScheduler, IScheduler backgroundScheduler, IViewLocator viewLocator, Page rootPage)
-        : base(rootPage)
-    {
-        _backgroundScheduler = backgroundScheduler;
-        MainThreadScheduler = mainScheduler;
-        _viewLocator = viewLocator;
-        _logger = this.Log();
-
-        PagePopped =
-            Observable
-                .FromEvent<EventHandler<NavigationEventArgs>, IViewModel>(
-                    handler =>
-                    {
-                        void Handler(object? sender, NavigationEventArgs args)
-                        {
-                            if (args.Page.BindingContext is IViewModel viewModel)
-                            {
-                                handler(viewModel);
-                            }
-                        }
-
-                        return Handler;
-                    },
-                    x => Popped += x,
-                    x => Popped -= x);
-
-        Behaviors.Add(new NavigationPageSystemPopBehavior(_navigationSource.AsObservable()));
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="NavigationView"/> class.
-    /// </summary>
-    /// <param name="mainScheduler">The main scheduler to scheduler UI tasks on.</param>
-    /// <param name="backgroundScheduler">The background scheduler.</param>
-    /// <param name="viewLocator">The view locator which will find views associated with view models.</param>
-    public NavigationView(IScheduler mainScheduler, IScheduler backgroundScheduler, IViewLocator viewLocator)
-    {
-        MainThreadScheduler = mainScheduler;
-        _backgroundScheduler = backgroundScheduler;
-        _viewLocator = viewLocator;
-        _logger = this.Log();
-
-        PagePopped =
-            Observable
-                .FromEvent<EventHandler<NavigationEventArgs>, IViewModel>(
-                    handler =>
-                    {
-                        void Handler(object? sender, NavigationEventArgs args)
-                        {
-                            if (args.Page.BindingContext is IViewModel viewModel)
-                            {
-                                handler(viewModel);
-                            }
-                        }
-
-                        return Handler;
-                    },
-                    x => Popped += x,
-                    x => Popped -= x);
-
-        Behaviors.Add(new NavigationPageSystemPopBehavior(_navigationSource.AsObservable()));
-    }
-
-    /// <inheritdoc />
-    public IScheduler MainThreadScheduler { get; }
-
-    /// <inheritdoc />
-    public IObservable<IViewModel> PagePopped { get; }
-
-    /// <inheritdoc />
-    public IObservable<Unit> PopModal() =>
-        Navigation
-            .PopModalAsync()
-            .ToObservable()
-            .Select(_ => Unit.Default)
-            .ObserveOn(MainThreadScheduler); // XF completes the pop operation on a background thread :/
-
-    /// <inheritdoc />
-    public IObservable<Unit> PopPage(bool animate)
-    {
-        _navigationSource.OnNext(NavigationSource.NavigationService);
-
-        return Navigation
-            .PopAsync(animate)
-            .ToObservable()
-            .Select(_ => Unit.Default)
-            .ObserveOn(MainThreadScheduler)
-            .Finally(() => _navigationSource.OnNext(NavigationSource.Device));
-    }
-
-    /// <inheritdoc />
-    public IObservable<Unit> PopToRootPage(bool animate) =>
-        Navigation
-            .PopToRootAsync(animate)
-            .ToObservable()
-            .Select(_ => Unit.Default)
-            .ObserveOn(MainThreadScheduler);
-
-    /// <inheritdoc />
-    public IObservable<Unit> PushModal(IViewModel modalViewModel, string? contract, bool withNavigationPage = true) =>
-        Observable
-            .Start(
-                () =>
-                {
-                    var page = LocatePageFor(modalViewModel, contract);
-                    SetPageTitle(page, modalViewModel.Id);
-                    return withNavigationPage ? new NavigationPage(page) : page;
-                },
-                CurrentThreadScheduler.Instance)
-            .ObserveOn(CurrentThreadScheduler.Instance)
-            .SelectMany(
-                page =>
-                    Navigation
-                        .PushModalAsync(page)
-                        .ToObservable());
-
-    /// <inheritdoc />
-    public IObservable<Unit> PushPage(
-        IViewModel viewModel,
-        string? contract,
-        bool resetStack,
-        bool animate) =>
-        Observable
-            .Start(
-                () =>
-                {
-                    var page = LocatePageFor(viewModel, contract);
-                    SetPageTitle(page, viewModel.Id);
-                    return page;
-                },
-                CurrentThreadScheduler.Instance)
-            .ObserveOn(CurrentThreadScheduler.Instance)
-            .SelectMany(
-                page =>
-                {
-                    if (resetStack)
-                    {
-                        if (Navigation.NavigationStack.Count == 0)
-                        {
-                            return Navigation.PushAsync(page, false).ToObservable();
-                        }
-
-                        // XF does not allow us to pop to a new root page. Instead, we need to inject the new root page and then pop to it.
-                        Navigation
-                            .InsertPageBefore(page, Navigation.NavigationStack[0]);
-
-                        return Navigation
-                            .PopToRootAsync(false)
-                            .ToObservable();
-                    }
-
-                    return Navigation
-                        .PushAsync(page, animate)
-                        .ToObservable();
-                });
-
-    /// <summary>
-    /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
-    /// </summary>
-    public void Dispose()
-    {
-        Dispose(disposing: true);
-        GC.SuppressFinalize(this);
-    }
-
-    /// <summary>
-    /// Releases unmanaged and - optionally - managed resources.
-    /// </summary>
-    /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
-    protected virtual void Dispose(bool disposing)
-    {
-        if (!_disposedValue)
-        {
-            if (disposing)
-            {
-                _navigationSource.Dispose();
-            }
-
-            _disposedValue = true;
-        }
-    }
-
-    private static void SetPageTitle(Page page, string resourceKey) =>
-
-        // var title = Localize.GetString(resourceKey);
-        // TODO: ensure resourceKey isn't null and is localized.
-        page.Title = resourceKey;
-
-    private Page LocatePageFor(object viewModel, string? contract)
-    {
-        var view = _viewLocator.ResolveView(viewModel, contract) ?? throw new InvalidOperationException(
-                $"No view could be located for type '{viewModel.GetType().FullName}', contract '{contract}'. Be sure Splat has an appropriate registration.");
-        if (view is not Page page)
-        {
-            throw new InvalidOperationException(
-                $"Resolved view '{view.GetType().FullName}' for type '{viewModel.GetType().FullName}', contract '{contract}' is not a Page.");
-        }
-
-        view.ViewModel = viewModel;
-
-        return page;
-    }
-}
diff --git a/src/Sextant.XamForms/Sextant.XamForms.csproj b/src/Sextant.XamForms/Sextant.XamForms.csproj
deleted file mode 100644
index 0331ff84..00000000
--- a/src/Sextant.XamForms/Sextant.XamForms.csproj
+++ /dev/null
@@ -1,25 +0,0 @@
-<Project Sdk="MSBuild.Sdk.Extras">
-  <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
-    <AssemblyName>Sextant.XamForms</AssemblyName>
-    <RootNamespace>Sextant.XamForms</RootNamespace>
-    <PackageId>Sextant.XamForms</PackageId>
-    <Nullable>enable</Nullable>
-    <LangVersion>preview</LangVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="ReactiveUI.XamForms" />
-    <PackageReference Include="System.Collections.Immutable" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Sextant\Sextant.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Update="Behaviors\NavigationPageSystemPopBehavior.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Update="Behaviors\BehaviorBase.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/Sextant.XamForms/Sextant.XamForms.csproj.DotSettings b/src/Sextant.XamForms/Sextant.XamForms.csproj.DotSettings
deleted file mode 100644
index 6de1da79..00000000
--- a/src/Sextant.XamForms/Sextant.XamForms.csproj.DotSettings
+++ /dev/null
@@ -1,3 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=behaviors/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=mixins/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/src/Sextant.sln b/src/Sextant.sln
index afbf6ea6..ec9ffe18 100644
--- a/src/Sextant.sln
+++ b/src/Sextant.sln
@@ -8,6 +8,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sextant.Tests", "Sextant.Te
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B1DD0155-5421-430D-B1F3-270EFCD5EE04}"
 	ProjectSection(SolutionItems) = preProject
+		..\.editorconfig = ..\.editorconfig
 		analyzers.ruleset = analyzers.ruleset
 		ApiGeneratorGlobalSuppressions.cs = ApiGeneratorGlobalSuppressions.cs
 		..\.github\workflows\ci-build.yml = ..\.github\workflows\ci-build.yml
@@ -15,13 +16,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Directory.build.targets = Directory.build.targets
 		Directory.Packages.props = Directory.Packages.props
 		global.json = global.json
+		..\README.md = ..\README.md
 		stylecop.json = stylecop.json
+		..\version.json = ..\version.json
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sextant.XamForms", "Sextant.XamForms\Sextant.XamForms.csproj", "{91D39618-AF73-4A28-9145-2DAC63437762}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sextant.XamForms.Tests", "Sextant.XamForms.Tests\Sextant.XamForms.Tests.csproj", "{1A8F7E6B-F9EE-46A7-ABB2-F09E7784B1BD}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sextant.Mocks", "Sextant.Mocks\Sextant.Mocks.csproj", "{07C90E5B-858E-4EB2-948B-8D0A698F439B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sextant.Plugins.Popup", "Sextant.Plugins.Popup\Sextant.Plugins.Popup.csproj", "{C863B0F3-46AF-46A3-93E9-5B1CEFA18896}"
@@ -44,14 +43,6 @@ Global
 		{DA6A30AC-CCA5-40BA-94A1-93E142E06515}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DA6A30AC-CCA5-40BA-94A1-93E142E06515}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DA6A30AC-CCA5-40BA-94A1-93E142E06515}.Release|Any CPU.Build.0 = Release|Any CPU
-		{91D39618-AF73-4A28-9145-2DAC63437762}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{91D39618-AF73-4A28-9145-2DAC63437762}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{91D39618-AF73-4A28-9145-2DAC63437762}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{91D39618-AF73-4A28-9145-2DAC63437762}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1A8F7E6B-F9EE-46A7-ABB2-F09E7784B1BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1A8F7E6B-F9EE-46A7-ABB2-F09E7784B1BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1A8F7E6B-F9EE-46A7-ABB2-F09E7784B1BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1A8F7E6B-F9EE-46A7-ABB2-F09E7784B1BD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{07C90E5B-858E-4EB2-948B-8D0A698F439B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{07C90E5B-858E-4EB2-948B-8D0A698F439B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{07C90E5B-858E-4EB2-948B-8D0A698F439B}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/src/Sextant/Abstractions/INavigable.cs b/src/Sextant/Abstractions/INavigable.cs
index 0349a814..398d0960 100644
--- a/src/Sextant/Abstractions/INavigable.cs
+++ b/src/Sextant/Abstractions/INavigable.cs
@@ -8,6 +8,4 @@ namespace Sextant;
 /// <summary>
 /// Interface that represents an element that is navigable.
 /// </summary>
-public interface INavigable : IViewModel, INavigated, INavigating
-{
-}
+public interface INavigable : IViewModel, INavigated, INavigating;
diff --git a/src/Sextant/Abstractions/INavigationParameter.cs b/src/Sextant/Abstractions/INavigationParameter.cs
index 5a79d32f..1f1fd0eb 100644
--- a/src/Sextant/Abstractions/INavigationParameter.cs
+++ b/src/Sextant/Abstractions/INavigationParameter.cs
@@ -10,6 +10,7 @@ namespace Sextant;
 /// <summary>
 /// Interface representing a parameter passed during navigation.
 /// </summary>
+[System.Diagnostics.CodeAnalysis.SuppressMessage("Naming", "CA1710:Identifiers should have correct suffix", Justification = "By Design.")]
 public interface INavigationParameter : IDictionary<string, object>
 {
     /// <summary>
diff --git a/src/Sextant/Abstractions/IPageViewModel.cs b/src/Sextant/Abstractions/IPageViewModel.cs
deleted file mode 100644
index 9ca884c9..00000000
--- a/src/Sextant/Abstractions/IPageViewModel.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) 2021 .NET Foundation and Contributors. All rights reserved.
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for full license information.
-
-using System;
-
-namespace Sextant;
-
-/// <summary>
-/// Interface that defines a view model for a page for the navigation stack.
-/// </summary>
-[Obsolete("Please use the IViewModel interface.")]
-public interface IPageViewModel : IViewModel
-{
-}
diff --git a/src/Sextant/Abstractions/IViewModel.cs b/src/Sextant/Abstractions/IViewModel.cs
index fd5a61db..f355c602 100644
--- a/src/Sextant/Abstractions/IViewModel.cs
+++ b/src/Sextant/Abstractions/IViewModel.cs
@@ -13,5 +13,5 @@ public interface IViewModel
     /// <summary>
     /// Gets the ID of the page.
     /// </summary>
-    string Id { get; }
+    string? Id { get; }
 }
diff --git a/src/Sextant/DependencyResolverMixins.cs b/src/Sextant/DependencyResolverMixins.cs
index 9fe2e65d..8815b822 100644
--- a/src/Sextant/DependencyResolverMixins.cs
+++ b/src/Sextant/DependencyResolverMixins.cs
@@ -13,12 +13,7 @@ namespace Sextant;
 /// <summary>
 /// Extension methods associated with the IMutableDependencyResolver interface.
 /// </summary>
-#if WINDOWS_UWP
-public static partial class DependencyResolverMixins
-#else
-
 public static class DependencyResolverMixins
-#endif
 {
     /// <summary>
     /// Gets the navigation view key.
@@ -288,6 +283,11 @@ public static IMutableDependencyResolver RegisterViewForNavigation<TView, TViewM
         where TView : class, IViewFor<TViewModel>
         where TViewModel : class, IViewModel
     {
+        if (resolver is null)
+        {
+            throw new ArgumentNullException(nameof(resolver));
+        }
+
         resolver.Register(viewFactory, typeof(IViewFor<TViewModel>));
         resolver.Register(viewModelFactory, typeof(TViewModel));
         return resolver;
@@ -306,8 +306,35 @@ public static IMutableDependencyResolver RegisterViewForNavigation<TView, TViewM
         where TView : class, IViewFor<TViewModel>
         where TViewModel : class, IViewModel
     {
+        if (resolver is null)
+        {
+            throw new ArgumentNullException(nameof(resolver));
+        }
+
         resolver.Register(() => view, typeof(IViewFor<TViewModel>));
         resolver.Register(() => viewModel, typeof(TViewModel));
         return resolver;
     }
+
+    /// <summary>
+    /// Registers the view for navigation.
+    /// </summary>
+    /// <typeparam name="TView">The type of the view.</typeparam>
+    /// <typeparam name="TViewModel">The type of the view model.</typeparam>
+    /// <param name="resolver">The resolver.</param>
+    /// <returns>The dependency resolver.</returns>
+    /// <exception cref="ArgumentNullException">resolver.</exception>
+    public static IMutableDependencyResolver RegisterViewForNavigation<TView, TViewModel>(this IMutableDependencyResolver resolver)
+        where TView : class, IViewFor<TViewModel>, new()
+        where TViewModel : class, IViewModel, new()
+    {
+        if (resolver is null)
+        {
+            throw new ArgumentNullException(nameof(resolver));
+        }
+
+        resolver.Register(() => new TView(), typeof(IViewFor<TViewModel>));
+        resolver.Register(() => new TViewModel(), typeof(TViewModel));
+        return resolver;
+    }
 }
diff --git a/src/Sextant/Navigation/ParameterViewStackServiceBase.cs b/src/Sextant/Navigation/ParameterViewStackServiceBase.cs
index eea63a8d..b17ce2f7 100644
--- a/src/Sextant/Navigation/ParameterViewStackServiceBase.cs
+++ b/src/Sextant/Navigation/ParameterViewStackServiceBase.cs
@@ -13,18 +13,13 @@ namespace Sextant;
 /// <summary>
 /// Abstract base class for view stack services.
 /// </summary>
-public abstract class ParameterViewStackServiceBase : ViewStackServiceBase, IParameterViewStackService
+/// <remarks>
+/// Initializes a new instance of the <see cref="ParameterViewStackServiceBase"/> class.
+/// </remarks>
+/// <param name="view">The view.</param>
+/// <param name="viewModelFactory">The view model factory.</param>
+public abstract class ParameterViewStackServiceBase(IView view, IViewModelFactory viewModelFactory) : ViewStackServiceBase(view, viewModelFactory), IParameterViewStackService
 {
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ParameterViewStackServiceBase"/> class.
-    /// </summary>
-    /// <param name="view">The view.</param>
-    /// <param name="viewModelFactory">The view model factory.</param>
-    protected ParameterViewStackServiceBase(IView view, IViewModelFactory viewModelFactory)
-        : base(view, viewModelFactory)
-    {
-    }
-
     /// <inheritdoc />
     public IObservable<Unit> PushPage(
         INavigable navigableViewModel,
@@ -144,7 +139,7 @@ public IObservable<Unit> PopPage(INavigationParameter parameter, bool animate =
                 throw new ArgumentNullException(nameof(parameter));
             }
 
-            IViewModel poppedPage = TopPage().FirstOrDefaultAsync().Wait()!;
+            var poppedPage = TopPage().FirstOrDefaultAsync().Wait()!;
             var composite = new CompositeDisposable();
 
             View
@@ -161,7 +156,7 @@ public IObservable<Unit> PopPage(INavigationParameter parameter, bool animate =
                                 .DisposeWith(composite))
                         .InvokeViewModelAction<IDestructible>(x => x.Destroy());
 
-                    IViewModel topPage = TopPage().FirstOrDefaultAsync().Wait()!;
+                    var topPage = TopPage().FirstOrDefaultAsync().Wait()!;
                     if (topPage is INavigated navigated)
                     {
                         navigated
diff --git a/src/Sextant/Navigation/ViewStackServiceBase.cs b/src/Sextant/Navigation/ViewStackServiceBase.cs
index cee0ca7c..ecff3f18 100644
--- a/src/Sextant/Navigation/ViewStackServiceBase.cs
+++ b/src/Sextant/Navigation/ViewStackServiceBase.cs
@@ -140,7 +140,7 @@ public IObservable<Unit> PushModal(IViewModel modal, string? contract = null, bo
     public IObservable<Unit> PushModal<TViewModel>(string? contract = null, bool withNavigationPage = true)
         where TViewModel : IViewModel
     {
-        TViewModel viewmodel = Factory.Create<TViewModel>(contract);
+        var viewmodel = Factory.Create<TViewModel>(contract);
         return PushModal(viewmodel, contract, withNavigationPage);
     }
 
@@ -148,7 +148,7 @@ public IObservable<Unit> PushModal<TViewModel>(string? contract = null, bool wit
     public IObservable<Unit> PushPage<TViewModel>(string? contract = null, bool resetStack = false, bool animate = true)
         where TViewModel : IViewModel
     {
-        TViewModel viewModel = Factory.Create<TViewModel>(contract);
+        var viewModel = Factory.Create<TViewModel>(contract);
 
         return PushPage(viewModel, contract, resetStack, animate);
     }
@@ -268,7 +268,7 @@ protected static void PopRootAndTick<T>(BehaviorSubject<IImmutableList<T>> stack
                {
                    poppedStack = stack.RemoveRange(stack.IndexOf(stack[1]), stack.Count - 1);
 
-                   foreach (T popped in stack.RemoveRange(poppedStack).Reverse())
+                   foreach (var popped in stack.RemoveRange(poppedStack).Reverse())
                    {
                        if (popped is null)
                        {
diff --git a/src/Sextant/Platforms/uikit-common/NavigationViewController.cs b/src/Sextant/Platforms/uikit-common/NavigationViewController.cs
index 6deafbbd..3575fa7c 100644
--- a/src/Sextant/Platforms/uikit-common/NavigationViewController.cs
+++ b/src/Sextant/Platforms/uikit-common/NavigationViewController.cs
@@ -28,24 +28,20 @@ namespace Sextant;
 /// Initializes a new instance of the <see cref="NavigationViewController" /> class.
 /// </remarks>
 /// <param name="mainScheduler">The main scheduler.</param>
-/// <param name="backgroundScheduler">The background scheduler.</param>
 /// <param name="viewLocator">The view locator.</param>
 [SuppressMessage("Design", "CA1010: Implement generic IEnumerable", Justification = "Base class declared IEnumerable.")]
 [SuppressMessage("Usage", "CA2213:Disposable fields should be disposed", Justification = "Previous usage did not throw an error.")]
 
 public class NavigationViewController(
     IScheduler? mainScheduler = null,
-    IScheduler? backgroundScheduler = null,
     IViewLocator? viewLocator = null) : UINavigationController, IView
 {
-    private readonly IScheduler _backgroundScheduler = backgroundScheduler ?? RxApp.TaskpoolScheduler;
-    private readonly IScheduler _mainScheduler = mainScheduler ?? RxApp.MainThreadScheduler;
     private readonly IViewLocator _viewLocator = viewLocator ?? ViewLocator.Current;
     private readonly Stack<UIViewController> _navigationPages = new();
     private readonly Subject<IViewModel?> _pagePopped = new();
 
     /// <inheritdoc />
-    public IScheduler MainThreadScheduler => _mainScheduler;
+    public IScheduler MainThreadScheduler { get; } = mainScheduler ?? RxApp.MainThreadScheduler;
 
     /// <inheritdoc />
     public IObservable<IViewModel?> PagePopped => _pagePopped;
@@ -55,7 +51,7 @@ public IObservable<Unit> PopModal() =>
         DismissViewControllerAsync(true)
             .ToObservable()
             .Select(_ => Unit.Default)
-            .ObserveOn(_mainScheduler);
+            .ObserveOn(MainThreadScheduler);
 
     /// <inheritdoc />
     public IObservable<Unit> PopPage(bool animate = true) =>
@@ -115,9 +111,7 @@ public IObservable<Unit> PushPage(
                 },
                 CurrentThreadScheduler.Instance)
             .ObserveOn(CurrentThreadScheduler.Instance)
-            .SelectMany(page =>
-            {
-                return Observable.Create<Unit>(
+            .SelectMany(page => Observable.Create<Unit>(
                     observer =>
                     {
                         CATransaction.Begin();
@@ -142,8 +136,7 @@ public IObservable<Unit> PushPage(
                         PushViewController(page, animate);
                         CATransaction.Commit();
                         return Disposable.Empty;
-                    });
-            });
+                    }));
 
     /// <inheritdoc/>
     public override UIViewController PopViewController(bool animated)
@@ -156,18 +149,13 @@ public override UIViewController PopViewController(bool animated)
         return poppedController;
     }
 
+    private static void SetPageTitle(UIViewController page, string? resourceKey) => page.Title = resourceKey;
+
     private UIViewController LocatePageFor(object viewModel, string? contract)
     {
-        var viewFor = _viewLocator.ResolveView(viewModel, contract);
-        var page = viewFor as UIViewController;
-
-        if (viewFor is null)
-        {
-            throw new InvalidOperationException(
+        var viewFor = _viewLocator.ResolveView(viewModel, contract) ?? throw new InvalidOperationException(
                 $"No view could be located for type '{viewModel.GetType().FullName}', contract '{contract}'. Be sure Splat has an appropriate registration.");
-        }
-
-        if (page is null)
+        if (viewFor is not UIViewController page)
         {
             throw new InvalidOperationException(
                 $"Resolved view '{viewFor.GetType().FullName}' for type '{viewModel.GetType().FullName}', contract '{contract}' is not a Page.");
@@ -177,6 +165,4 @@ private UIViewController LocatePageFor(object viewModel, string? contract)
 
         return page;
     }
-
-    private void SetPageTitle(UIViewController page, string resourceKey) => page.Title = resourceKey;
 }
diff --git a/src/Sextant/Platforms/uikit-common/SextantExtensions.cs b/src/Sextant/Platforms/uikit-common/SextantExtensions.cs
index a48117b8..289f3b05 100644
--- a/src/Sextant/Platforms/uikit-common/SextantExtensions.cs
+++ b/src/Sextant/Platforms/uikit-common/SextantExtensions.cs
@@ -45,16 +45,14 @@ public static IMutableDependencyResolver RegisterNavigationController(
     /// </summary>
     /// <param name="dependencyResolver">The dependency resolver.</param>
     /// <param name="mainScheduler">The main scheduler.</param>
-    /// <param name="backgroundScheduler">The background scheduler.</param>
     /// <returns>
     /// The mutable dependency resolver.
     /// </returns>
     public static IMutableDependencyResolver RegisterNavigationController(
         this IMutableDependencyResolver dependencyResolver,
-        IScheduler mainScheduler,
-        IScheduler backgroundScheduler)
+        IScheduler mainScheduler)
     {
-        dependencyResolver.RegisterLazySingleton(() => new NavigationViewController(mainScheduler, backgroundScheduler));
+        dependencyResolver.RegisterLazySingleton(() => new NavigationViewController(mainScheduler));
         return dependencyResolver;
     }
 
diff --git a/src/Sextant/Sextant.csproj b/src/Sextant/Sextant.csproj
index 8369d078..0e76f1e5 100644
--- a/src/Sextant/Sextant.csproj
+++ b/src/Sextant/Sextant.csproj
@@ -1,56 +1,31 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;Xamarin.iOS10;Xamarin.TVOS10;MonoAndroid13.0;net6.0;net7.0;net8.0;net7.0-android;net7.0-ios;net7.0-tvos;net7.0-macos;net7.0-maccatalyst;net8.0-android;net8.0-ios;net8.0-tvos;net8.0-macos;net8.0-maccatalyst</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net462;net472;net6.0-windows10.0.17763.0;net7.0-windows10.0.17763.0;net8.0-windows10.0.17763.0;net6.0-windows10.0.19041.0;net7.0-windows10.0.19041.0;net8.0-windows10.0.19041.0</TargetFrameworks>
-    <AssemblyName>Sextant</AssemblyName>
+    <TargetFrameworks>netstandard2.0;net6.0;net8.0;net8.0-android;net8.0-ios;net8.0-tvos;net8.0-macos;net8.0-maccatalyst</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net462;net472;net6.0-windows10.0.17763.0;net8.0-windows10.0.17763.0;net6.0-windows10.0.19041.0;net8.0-windows10.0.19041.0</TargetFrameworks>
     <RootNamespace>Sextant</RootNamespace>
-    <PackageId>Sextant</PackageId>
     <Nullable>enable</Nullable>
-    <LangVersion>preview</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <Compile Remove="Platforms\**\*.cs" />
     <None Include="Platforms\**\*.cs" />
-    <PackageReference Include="System.Collections.Immutable" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="ReactiveUI" />
   </ItemGroup>
-  <ItemGroup Condition=" $(TargetFramework.StartsWith('Xamarin.iOS')) ">
-    <Compile Include="Platforms\apple-common\**\*.cs" />
-    <Compile Include="Platforms\ios\**\*.cs" />
-    <Compile Include="Platforms\uikit-common\**\*.cs" />
-    <Reference Include="System.Runtime.Serialization" />
+  <ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard2.0')) or $(TargetFramework.StartsWith('net4'))">
+    <PackageReference Include="System.Collections.Immutable" />
   </ItemGroup>
   <ItemGroup Condition=" $(TargetFramework.EndsWith('-ios')) ">
     <Compile Include="Platforms\apple-common\**\*.cs" />
     <Compile Include="Platforms\ios\**\*.cs" />
     <Compile Include="Platforms\uikit-common\**\*.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" $(TargetFramework.StartsWith('Xamarin.WatchOS')) ">
-    <Compile Include="Platforms\apple-common\**\*.cs" />
-    <Compile Include="Platforms\ios\**\*.cs" />
-    <Compile Include="Platforms\uikit-common\**\*.cs" />
-    <Reference Include="System.Runtime.Serialization" />
-  </ItemGroup>
-  <ItemGroup Condition=" $(TargetFramework.StartsWith('Xamarin.TVOS')) ">
-    <Compile Include="Platforms\apple-common\**\*.cs" />
-    <Compile Include="Platforms\ios\**\*.cs" />
-    <Compile Include="Platforms\uikit-common\**\*.cs" />
-    <Reference Include="System.Runtime.Serialization" />
-  </ItemGroup>
   <ItemGroup Condition=" $(TargetFramework.EndsWith('-tvos')) ">
     <Compile Include="Platforms\apple-common\**\*.cs" />
     <Compile Include="Platforms\ios\**\*.cs" />
     <Compile Include="Platforms\uikit-common\**\*.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" $(TargetFramework.StartsWith('Xamarin.Mac'))">
-    <Compile Include="Platforms\apple-common\**\*.cs" />
-    <Compile Include="Platforms\appkit-common\**\*.cs" />
-    <Compile Include="Platforms\ios\**\*.cs" />
-    <Reference Include="System.Runtime.Serialization" />
-  </ItemGroup>
   <ItemGroup Condition="$(TargetFramework.EndsWith('-macos'))">
     <Compile Include="Platforms\apple-common\**\*.cs" />
     <Compile Include="Platforms\mac\**\*.cs" />
@@ -60,25 +35,16 @@
     <Compile Include="Platforms\apple-common\**\*.cs" />
     <Compile Include="Platforms\mac\**\*.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" $(TargetFramework.StartsWith('MonoAndroid')) ">
-    <Compile Include="Platforms\android\**\*.cs" />
-    <Compile Include="Platforms\xamarin-common\**\*.cs" />
-    <Reference Include="System.Runtime.Serialization" />
-  </ItemGroup>
   <ItemGroup Condition=" $(TargetFramework.EndsWith('-android')) ">
     <Compile Include="Platforms\android\**\*.cs" />
   </ItemGroup>
   <ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) ">
     <Compile Include="Platforms\net4\**\*.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" $(TargetFramework.StartsWith('uap')) ">
-    <Compile Include="Platforms\uap\**\*.cs" />
-    <Page Include="Platforms\uap\**\*.xaml" />
-  </ItemGroup>
   <ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard2.0')) ">
     <Compile Include="Platforms\netstandard2.0\**\*.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net8.0' or $(TargetFramework.EndsWith('-windows10.0.17763.0')) or $(TargetFramework.EndsWith('-windows10.0.19041.0'))  ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net8.0' or $(TargetFramework.EndsWith('-windows10.0.17763.0')) or $(TargetFramework.EndsWith('-windows10.0.19041.0'))  ">
     <Compile Include="Platforms\net\**\*.cs" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/version.json b/version.json
index be4a539b..b30eb350 100644
--- a/version.json
+++ b/version.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.12",
+  "version": "3.0",
   "publicReleaseRefSpec": [
     "^refs/heads/main", // we release out of master
     "^refs/heads/rel/\\d+\\.\\d+\\.\\d+" // we also release branches starting with rel/N.N.N