diff --git a/.editorconfig b/.editorconfig
index 6ec408421b09..184e44b0bd10 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -19,6 +19,10 @@ indent_size = 2
 [*.cs]
 indent_style = tab
 
+# TODO: Disable platform compatibility analyzer until all CA1416 violations are fixed
+# https://docs.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/ca1416
+dotnet_diagnostic.CA1416.severity = none
+
 # Modifier preferences
 dotnet_style_require_accessibility_modifiers = never:suggestion
 
diff --git a/.nuspec/Microsoft.Maui.Controls.MultiTargeting.targets b/.nuspec/Microsoft.Maui.Controls.MultiTargeting.targets
index dbde4aba4ed6..1008f09bfefd 100644
--- a/.nuspec/Microsoft.Maui.Controls.MultiTargeting.targets
+++ b/.nuspec/Microsoft.Maui.Controls.MultiTargeting.targets
@@ -1,41 +1,47 @@
 <Project>
   <ItemGroup Condition="$(TargetFramework.StartsWith('Xamarin.iOS')) != true AND $(TargetFramework.StartsWith('net6.0-ios')) != true AND $(TargetFramework.StartsWith('net6.0-maccatalyst')) != true ">
-    <Compile Remove="**\*.iOS.cs" />
-    <None Include="**\*.iOS.cs" />
-    <Compile Remove="**\iOS\*.cs" />
-    <None Include="**\iOS\*.cs" />
+    <Compile Remove="**\**\*.iOS.cs" />
+    <None Include="**\**\*.iOS.cs" />
+    <Compile Remove="**\iOS\**\*.cs" />
+    <None Include="**\iOS\**\*.cs" />
   </ItemGroup>
   <ItemGroup Condition="$(TargetFramework.StartsWith('Xamarin.Mac')) != true ">
     <Compile Remove="**\*.Mac.cs" />
     <None Include="**\*.Mac.cs" />
-    <Compile Remove="**\Mac\*.cs" />
-    <None Include="**\Mac\*.cs" />
+    <Compile Remove="**\Mac\**\*.cs" />
+    <None Include="**\Mac\**\*.cs" />
   </ItemGroup>
   <ItemGroup Condition="$(TargetFramework.StartsWith('Xamarin.Mac')) != true AND $(TargetFramework.StartsWith('Xamarin.iOS')) != true AND $(TargetFramework.StartsWith('net6.0-ios')) != true AND $(TargetFramework.StartsWith('net6.0-maccatalyst')) != true">
     <Compile Remove="**\*.MaciOS.cs" />
     <None Include="**\*.MaciOS.cs" />
-    <Compile Remove="**\MaciOS\*.cs" />
-    <None Include="**\MaciOS\*.cs" />
+    <Compile Remove="**\MaciOS\**\*.cs" />
+    <None Include="**\MaciOS\**\*.cs" />
   </ItemGroup>
   <ItemGroup Condition="$(TargetFramework.StartsWith('MonoAndroid')) != true AND $(TargetFramework.StartsWith('net6.0-android')) != true ">
-    <Compile Remove="**\*.Android.cs" />
-    <None Include="**\*.Android.cs" />
-    <Compile Remove="**\Android\*.cs" />
-    <None Include="**\Android\*.cs" />
+    <Compile Remove="**\**\*.Android.cs" />
+    <None Include="**\**\*.Android.cs" />
+    <Compile Remove="**\Android\**\*.cs" />
+    <None Include="**\Android\**\*.cs" />
   </ItemGroup>
   <ItemGroup Condition="$(TargetFramework.StartsWith('netstandard')) != true ">
     <Compile Remove="**\*.Standard.cs" />
     <None Include="**\*.Standard.cs" />
-    <Compile Remove="**\Standard\*.cs" />
-    <None Include="**\Standard\*.cs" />
+    <Compile Remove="**\Standard\**\*.cs" />
+    <None Include="**\Standard\**\*.cs" />
   </ItemGroup>
   <ItemGroup Condition="$(TargetFramework.Contains('-windows')) != true ">
     <Compile Remove="**\*.Windows.cs" />
     <None Include="**\*.Windows.cs" />
-    <Compile Remove="**\Windows\*.cs" />
-    <None Include="**\Windows\*.cs" />
+    <Compile Remove="**\Windows\**\*.cs" />
+    <None Include="**\Windows\**\*.cs" />
+    <Compile Remove="**\*.uwp.cs" />
+    <None Include="**\*.uwp.cs" />
   </ItemGroup>
-
+  <ItemGroup Condition=" $(TargetFramework.StartsWith('uap10.0')) ">
+    <Compile Remove="**\*.uwp.cs" />
+    <None Include="**\*.uwp.cs" />
+  </ItemGroup>
+  
   <PropertyGroup>
     <!-- Windows -->
     <WindowsProjectFolder>Platform\Windows\</WindowsProjectFolder>
@@ -64,7 +70,6 @@
     <DefineConstants>$(DefineConstants);MACCATALYST;IOS</DefineConstants>
   </PropertyGroup>
 
-
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
   </PropertyGroup>
@@ -73,12 +78,19 @@
     <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" />
     <PackageReference Include="Xamarin.Google.Android.Material" />
     <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" />
+    <PackageReference Include="Xamarin.AndroidX.Navigation.UI" />
+    <PackageReference Include="Xamarin.AndroidX.Navigation.Fragment" />
+    <PackageReference Include="Xamarin.AndroidX.Navigation.Runtime" />
+    <PackageReference Include="Xamarin.AndroidX.Navigation.Common" />
   </ItemGroup>
   <PropertyGroup Condition="$(TargetFramework.Contains('-windows')) == true ">
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
     <DefineConstants>WINDOWS;$(DefineConstants)</DefineConstants>
   </PropertyGroup>
+  <PropertyGroup Condition=" $(TargetFramework.StartsWith('uap10.0')) ">
+    <DefineConstants>WINDOWS_UWP;$(DefineConstants)</DefineConstants>
+  </PropertyGroup>
   <ItemGroup Condition="$(TargetFramework.Contains('-windows')) == true ">
     <PackageReference Include="Microsoft.ProjectReunion" />
     <PackageReference Include="Microsoft.ProjectReunion.Foundation" />
diff --git a/.nuspec/Microsoft.Maui.Resizetizer.targets b/.nuspec/Microsoft.Maui.Resizetizer.targets
index 00072c9fa2d2..ea80880dfee4 100644
--- a/.nuspec/Microsoft.Maui.Resizetizer.targets
+++ b/.nuspec/Microsoft.Maui.Resizetizer.targets
@@ -32,14 +32,18 @@
         AssemblyFile="$(_ResizetizerTaskAssemblyName)"
         TaskName="Microsoft.Maui.Resizetizer.GenerateSplashStoryboard" />
 
+    <UsingTask
+        AssemblyFile="$(_ResizetizerTaskAssemblyName)"
+        TaskName="Microsoft.Maui.Resizetizer.GetMauiAssetPath" />
+
     <PropertyGroup>
         <CleanDependsOn>
             $(CleanDependsOn);
             _CleanResizetizer;
         </CleanDependsOn>
 
-        <_ResizetizerInputsFile>$(IntermediateOutputPath)resizetizer.inputs</_ResizetizerInputsFile>
-        <_ResizetizerStampFile>$(IntermediateOutputPath)resizetizer.stamp</_ResizetizerStampFile>
+        <_ResizetizerInputsFile>$(IntermediateOutputPath)mauiimage.inputs</_ResizetizerInputsFile>
+        <_ResizetizerStampFile>$(IntermediateOutputPath)mauiimage.stamp</_ResizetizerStampFile>
         <_MauiFontInputsFile>$(IntermediateOutputPath)mauifont.inputs</_MauiFontInputsFile>
         <_MauiFontStampFile>$(IntermediateOutputPath)mauifont.stamp</_MauiFontStampFile>
         <_MauiSplashInputsFile>$(IntermediateOutputPath)mauisplash.inputs</_MauiSplashInputsFile>
@@ -79,6 +83,7 @@
         <ResizetizeDependsOnTargets>
             $(ResizetizeDependsOnTargets);
             ResizetizeCollectItems;
+            ProcessMauiSplashScreens;
         </ResizetizeDependsOnTargets>
         <ProcessMauiFontsDependsOnTargets>
             $(ProcessMauiFontsDependsOnTargets);
@@ -166,7 +171,7 @@
             <MauiItem Include="@(MauiImage)" ItemGroupName="MauiImage" Condition="'%(MauiImage.ForegroundFile)' == ''" />
             <MauiItem Include="@(MauiImage)" ItemGroupName="MauiImage" Condition="'%(MauiImage.ForegroundFile)' != ''" ForegroundFile="$([System.IO.Path]::GetFullPath('%(MauiImage.ForegroundFile)'))" />
             <MauiItem Include="@(MauiFont)"  ItemGroupName="MauiFont" />
-            <MauiItem Include="@(MauiAsset)" ItemGroupName="MauiAsset" />
+            <MauiItem Include="@(MauiAsset)" ItemGroupName="MauiAsset" ProjectDirectory="$(MSBuildProjectDirectory)" />
             <MauiItem Include="@(MauiSplashScreen)" ItemGroupName="MauiSplashScreen" />
         </ItemGroup>
 
@@ -246,15 +251,19 @@
     </Target>
 
     <Target Name="ProcessMauiAssets">
-        <ItemGroup Condition="'$(_ResizetizerIsAndroidApp)' == 'True'">
-            <AndroidAsset Include="@(MauiAsset)" Link="%(FileName)%(Extension)" />
-        </ItemGroup>
-        <ItemGroup Condition="'$(_ResizetizerIsiOSApp)' == 'True'">
-            <Content Include="@(MauiAsset)" Link="%(FileName)%(Extension)" />
-        </ItemGroup>
-        <ItemGroup Condition="'$(_ResizetizerIsUWPApp)' == 'True' Or '$(_ResizetizerIsWinUIApp)' == 'True'">
-            <ContentWithTargetPath Include="@(MauiAsset)" TargetPath="Assets\%(Filename)%(Extension)" />
-        </ItemGroup>
+        <PropertyGroup Condition="'$(_ResizetizerIsUWPApp)' == 'True' Or '$(_ResizetizerIsWinUIApp)' == 'True'">
+            <_MauiAssetFolderName>Assets</_MauiAssetFolderName>
+            <_MauiAssetItemMetadata>TargetPath</_MauiAssetItemMetadata>
+        </PropertyGroup>
+        <GetMauiAssetPath
+            ProjectDirectory="$(MSBuildProjectDirectory)"
+            FolderName="$(_MauiAssetFolderName)"
+            ItemMetadata="$(_MauiAssetItemMetadata)"
+            Input="@(MauiAsset)">
+            <Output ItemName="AndroidAsset"          TaskParameter="Output" Condition="'$(_ResizetizerIsAndroidApp)' == 'True'" />
+            <Output ItemName="Content"               TaskParameter="Output" Condition="'$(_ResizetizerIsiOSApp)' == 'True'" />
+            <Output ItemName="ContentWithTargetPath" TaskParameter="Output" Condition="'$(_ResizetizerIsUWPApp)' == 'True' Or '$(_ResizetizerIsWinUIApp)' == 'True'" />
+        </GetMauiAssetPath>
     </Target>
 
     <Target Name="ProcessMauiSplashScreens"
diff --git a/Compatibility.ControlGallery.sln b/Compatibility.ControlGallery.sln
index 046326d40b38..d5f55c5ca59f 100644
--- a/Compatibility.ControlGallery.sln
+++ b/Compatibility.ControlGallery.sln
@@ -77,22 +77,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Essentials.DeviceTests.iOS"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Essentials.DeviceTests.Shared", "src\Essentials\test\DeviceTests.Shared\Essentials.DeviceTests.Shared.csproj", "{81128D28-CFC8-4EA4-B68D-9939339C461A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{5817A848-0B04-4035-9F7E-B8621B61CBDD}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.UWP", "src\Essentials\samples\Samples.UWP\Samples.UWP.csproj", "{5A1D97F2-6703-4278-BBF2-12C065F7E94A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Tizen", "src\Essentials\samples\Samples.Tizen\Samples.Tizen.csproj", "{CFBEEB38-D3E8-4100-8CFB-E0A9C4FC0348}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Mac", "src\Essentials\samples\Samples.Mac\Samples.Mac.csproj", "{89899D16-4BD1-49B1-9903-9F6BB26C5DC5}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.iOS", "src\Essentials\samples\Samples.iOS\Samples.iOS.csproj", "{AB6242B7-634F-4839-A991-7629D0D2C636}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Android", "src\Essentials\samples\Samples.Android\Samples.Android.csproj", "{3C0CDEF3-495E-45F4-8B12-0E05EF11295C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples", "src\Essentials\samples\Samples\Samples.csproj", "{2C69EB76-02C4-4921-96A1-4D70CB7CE744}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample.Server.WebAuthenticator", "src\Essentials\samples\Sample.Server.WebAuthenticator\Sample.Server.WebAuthenticator.csproj", "{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.Benchmarks", "src\Core\tests\Benchmarks\Core.Benchmarks.csproj", "{73100F0D-C0BB-4F16-8FC2-FA3FA8ACD424}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{806499EB-C2CC-4E85-BC19-613F3DE5E0C3}"
@@ -654,218 +638,6 @@ Global
 		{81128D28-CFC8-4EA4-B68D-9939339C461A}.Release|x64.Build.0 = Release|Any CPU
 		{81128D28-CFC8-4EA4-B68D-9939339C461A}.Release|x86.ActiveCfg = Release|Any CPU
 		{81128D28-CFC8-4EA4-B68D-9939339C461A}.Release|x86.Build.0 = Release|Any CPU
-		{5A1D97F2-6703-4278-BBF2-12C065F7E94A}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{5A1D97F2-6703-4278-BBF2-12C065F7E94A}.Debug|Any CPU.Build.0 = Debug|x86
-		{5A1D97F2-6703-4278-BBF2-12C065F7E94A}.Debug|Any CPU.Deploy.0 = Debug|x86
-		{5A1D97F2-6703-4278-BBF2-12C065F7E94A}.Debug|ARM.ActiveCfg = Debug|ARM
-		{5A1D97F2-6703-4278-BBF2-12C065F7E94A}.Debug|ARM.Build.0 = Debug|ARM
-		{5A1D97F2-6703-4278-BBF2-12C065F7E94A}.Debug|ARM.Deploy.0 = Debug|ARM
-		{5A1D97F2-6703-4278-BBF2-12C065F7E94A}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{5A1D97F2-6703-4278-BBF2-12C065F7E94A}.Debug|ARM64.Build.0 = Debug|ARM64
-		{5A1D97F2-6703-4278-BBF2-12C065F7E94A}.Debug|ARM64.Deploy.0 = Debug|ARM64
-		{5A1D97F2-6703-4278-BBF2-12C065F7E94A}.Debug|iPhone.ActiveCfg = Debug|x86
-		{5A1D97F2-6703-4278-BBF2-12C065F7E94A}.Debug|iPhone.Build.0 = Debug|x86
-		{5A1D97F2-6703-4278-BBF2-12C065F7E94A}.Debug|iPhone.Deploy.0 = Debug|x86
-		{5A1D97F2-6703-4278-BBF2-12C065F7E94A}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
-		{5A1D97F2-6703-4278-BBF2-12C065F7E94A}.Debug|iPhoneSimulator.Build.0 = Debug|x86
-		{5A1D97F2-6703-4278-BBF2-12C065F7E94A}.Debug|iPhoneSimulator.Deploy.0 = Debug|x86
-		{5A1D97F2-6703-4278-BBF2-12C065F7E94A}.Debug|x64.ActiveCfg = Debug|x64
-		{5A1D97F2-6703-4278-BBF2-12C065F7E94A}.Debug|x64.Build.0 = Debug|x64
-		{5A1D97F2-6703-4278-BBF2-12C065F7E94A}.Debug|x64.Deploy.0 = Debug|x64
-		{5A1D97F2-6703-4278-BBF2-12C065F7E94A}.Debug|x86.ActiveCfg = Debug|x86
-		{5A1D97F2-6703-4278-BBF2-12C065F7E94A}.Debug|x86.Build.0 = Debug|x86
-		{5A1D97F2-6703-4278-BBF2-12C065F7E94A}.Debug|x86.Deploy.0 = Debug|x86
-		{5A1D97F2-6703-4278-BBF2-12C065F7E94A}.Release|Any CPU.ActiveCfg = Release|x86
-		{5A1D97F2-6703-4278-BBF2-12C065F7E94A}.Release|ARM.ActiveCfg = Release|ARM
-		{5A1D97F2-6703-4278-BBF2-12C065F7E94A}.Release|ARM.Build.0 = Release|ARM
-		{5A1D97F2-6703-4278-BBF2-12C065F7E94A}.Release|ARM.Deploy.0 = Release|ARM
-		{5A1D97F2-6703-4278-BBF2-12C065F7E94A}.Release|ARM64.ActiveCfg = Release|ARM64
-		{5A1D97F2-6703-4278-BBF2-12C065F7E94A}.Release|ARM64.Build.0 = Release|ARM64
-		{5A1D97F2-6703-4278-BBF2-12C065F7E94A}.Release|ARM64.Deploy.0 = Release|ARM64
-		{5A1D97F2-6703-4278-BBF2-12C065F7E94A}.Release|iPhone.ActiveCfg = Release|x86
-		{5A1D97F2-6703-4278-BBF2-12C065F7E94A}.Release|iPhoneSimulator.ActiveCfg = Release|x86
-		{5A1D97F2-6703-4278-BBF2-12C065F7E94A}.Release|x64.ActiveCfg = Release|x64
-		{5A1D97F2-6703-4278-BBF2-12C065F7E94A}.Release|x64.Build.0 = Release|x64
-		{5A1D97F2-6703-4278-BBF2-12C065F7E94A}.Release|x64.Deploy.0 = Release|x64
-		{5A1D97F2-6703-4278-BBF2-12C065F7E94A}.Release|x86.ActiveCfg = Release|x86
-		{5A1D97F2-6703-4278-BBF2-12C065F7E94A}.Release|x86.Build.0 = Release|x86
-		{5A1D97F2-6703-4278-BBF2-12C065F7E94A}.Release|x86.Deploy.0 = Release|x86
-		{CFBEEB38-D3E8-4100-8CFB-E0A9C4FC0348}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CFBEEB38-D3E8-4100-8CFB-E0A9C4FC0348}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CFBEEB38-D3E8-4100-8CFB-E0A9C4FC0348}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{CFBEEB38-D3E8-4100-8CFB-E0A9C4FC0348}.Debug|ARM.Build.0 = Debug|Any CPU
-		{CFBEEB38-D3E8-4100-8CFB-E0A9C4FC0348}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{CFBEEB38-D3E8-4100-8CFB-E0A9C4FC0348}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{CFBEEB38-D3E8-4100-8CFB-E0A9C4FC0348}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{CFBEEB38-D3E8-4100-8CFB-E0A9C4FC0348}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{CFBEEB38-D3E8-4100-8CFB-E0A9C4FC0348}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{CFBEEB38-D3E8-4100-8CFB-E0A9C4FC0348}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{CFBEEB38-D3E8-4100-8CFB-E0A9C4FC0348}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CFBEEB38-D3E8-4100-8CFB-E0A9C4FC0348}.Debug|x64.Build.0 = Debug|Any CPU
-		{CFBEEB38-D3E8-4100-8CFB-E0A9C4FC0348}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CFBEEB38-D3E8-4100-8CFB-E0A9C4FC0348}.Debug|x86.Build.0 = Debug|Any CPU
-		{CFBEEB38-D3E8-4100-8CFB-E0A9C4FC0348}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CFBEEB38-D3E8-4100-8CFB-E0A9C4FC0348}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CFBEEB38-D3E8-4100-8CFB-E0A9C4FC0348}.Release|ARM.ActiveCfg = Release|Any CPU
-		{CFBEEB38-D3E8-4100-8CFB-E0A9C4FC0348}.Release|ARM.Build.0 = Release|Any CPU
-		{CFBEEB38-D3E8-4100-8CFB-E0A9C4FC0348}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{CFBEEB38-D3E8-4100-8CFB-E0A9C4FC0348}.Release|ARM64.Build.0 = Release|Any CPU
-		{CFBEEB38-D3E8-4100-8CFB-E0A9C4FC0348}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{CFBEEB38-D3E8-4100-8CFB-E0A9C4FC0348}.Release|iPhone.Build.0 = Release|Any CPU
-		{CFBEEB38-D3E8-4100-8CFB-E0A9C4FC0348}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{CFBEEB38-D3E8-4100-8CFB-E0A9C4FC0348}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{CFBEEB38-D3E8-4100-8CFB-E0A9C4FC0348}.Release|x64.ActiveCfg = Release|Any CPU
-		{CFBEEB38-D3E8-4100-8CFB-E0A9C4FC0348}.Release|x64.Build.0 = Release|Any CPU
-		{CFBEEB38-D3E8-4100-8CFB-E0A9C4FC0348}.Release|x86.ActiveCfg = Release|Any CPU
-		{CFBEEB38-D3E8-4100-8CFB-E0A9C4FC0348}.Release|x86.Build.0 = Release|Any CPU
-		{89899D16-4BD1-49B1-9903-9F6BB26C5DC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{89899D16-4BD1-49B1-9903-9F6BB26C5DC5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{89899D16-4BD1-49B1-9903-9F6BB26C5DC5}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{89899D16-4BD1-49B1-9903-9F6BB26C5DC5}.Debug|ARM.Build.0 = Debug|Any CPU
-		{89899D16-4BD1-49B1-9903-9F6BB26C5DC5}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{89899D16-4BD1-49B1-9903-9F6BB26C5DC5}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{89899D16-4BD1-49B1-9903-9F6BB26C5DC5}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{89899D16-4BD1-49B1-9903-9F6BB26C5DC5}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{89899D16-4BD1-49B1-9903-9F6BB26C5DC5}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{89899D16-4BD1-49B1-9903-9F6BB26C5DC5}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{89899D16-4BD1-49B1-9903-9F6BB26C5DC5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{89899D16-4BD1-49B1-9903-9F6BB26C5DC5}.Debug|x64.Build.0 = Debug|Any CPU
-		{89899D16-4BD1-49B1-9903-9F6BB26C5DC5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{89899D16-4BD1-49B1-9903-9F6BB26C5DC5}.Debug|x86.Build.0 = Debug|Any CPU
-		{89899D16-4BD1-49B1-9903-9F6BB26C5DC5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{89899D16-4BD1-49B1-9903-9F6BB26C5DC5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{89899D16-4BD1-49B1-9903-9F6BB26C5DC5}.Release|ARM.ActiveCfg = Release|Any CPU
-		{89899D16-4BD1-49B1-9903-9F6BB26C5DC5}.Release|ARM.Build.0 = Release|Any CPU
-		{89899D16-4BD1-49B1-9903-9F6BB26C5DC5}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{89899D16-4BD1-49B1-9903-9F6BB26C5DC5}.Release|ARM64.Build.0 = Release|Any CPU
-		{89899D16-4BD1-49B1-9903-9F6BB26C5DC5}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{89899D16-4BD1-49B1-9903-9F6BB26C5DC5}.Release|iPhone.Build.0 = Release|Any CPU
-		{89899D16-4BD1-49B1-9903-9F6BB26C5DC5}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{89899D16-4BD1-49B1-9903-9F6BB26C5DC5}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{89899D16-4BD1-49B1-9903-9F6BB26C5DC5}.Release|x64.ActiveCfg = Release|Any CPU
-		{89899D16-4BD1-49B1-9903-9F6BB26C5DC5}.Release|x64.Build.0 = Release|Any CPU
-		{89899D16-4BD1-49B1-9903-9F6BB26C5DC5}.Release|x86.ActiveCfg = Release|Any CPU
-		{89899D16-4BD1-49B1-9903-9F6BB26C5DC5}.Release|x86.Build.0 = Release|Any CPU
-		{AB6242B7-634F-4839-A991-7629D0D2C636}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
-		{AB6242B7-634F-4839-A991-7629D0D2C636}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
-		{AB6242B7-634F-4839-A991-7629D0D2C636}.Debug|ARM.ActiveCfg = Debug|iPhoneSimulator
-		{AB6242B7-634F-4839-A991-7629D0D2C636}.Debug|ARM64.ActiveCfg = Debug|iPhoneSimulator
-		{AB6242B7-634F-4839-A991-7629D0D2C636}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{AB6242B7-634F-4839-A991-7629D0D2C636}.Debug|iPhone.Build.0 = Debug|iPhone
-		{AB6242B7-634F-4839-A991-7629D0D2C636}.Debug|iPhone.Deploy.0 = Debug|iPhone
-		{AB6242B7-634F-4839-A991-7629D0D2C636}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{AB6242B7-634F-4839-A991-7629D0D2C636}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{AB6242B7-634F-4839-A991-7629D0D2C636}.Debug|x64.ActiveCfg = Debug|iPhoneSimulator
-		{AB6242B7-634F-4839-A991-7629D0D2C636}.Debug|x64.Build.0 = Debug|iPhoneSimulator
-		{AB6242B7-634F-4839-A991-7629D0D2C636}.Debug|x64.Deploy.0 = Debug|iPhoneSimulator
-		{AB6242B7-634F-4839-A991-7629D0D2C636}.Debug|x86.ActiveCfg = Debug|iPhoneSimulator
-		{AB6242B7-634F-4839-A991-7629D0D2C636}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator
-		{AB6242B7-634F-4839-A991-7629D0D2C636}.Release|ARM.ActiveCfg = Release|iPhoneSimulator
-		{AB6242B7-634F-4839-A991-7629D0D2C636}.Release|ARM64.ActiveCfg = Release|iPhoneSimulator
-		{AB6242B7-634F-4839-A991-7629D0D2C636}.Release|iPhone.ActiveCfg = Release|iPhone
-		{AB6242B7-634F-4839-A991-7629D0D2C636}.Release|iPhone.Build.0 = Release|iPhone
-		{AB6242B7-634F-4839-A991-7629D0D2C636}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{AB6242B7-634F-4839-A991-7629D0D2C636}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{AB6242B7-634F-4839-A991-7629D0D2C636}.Release|x64.ActiveCfg = Release|iPhoneSimulator
-		{AB6242B7-634F-4839-A991-7629D0D2C636}.Release|x86.ActiveCfg = Release|iPhoneSimulator
-		{3C0CDEF3-495E-45F4-8B12-0E05EF11295C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3C0CDEF3-495E-45F4-8B12-0E05EF11295C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3C0CDEF3-495E-45F4-8B12-0E05EF11295C}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{3C0CDEF3-495E-45F4-8B12-0E05EF11295C}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{3C0CDEF3-495E-45F4-8B12-0E05EF11295C}.Debug|ARM.Build.0 = Debug|Any CPU
-		{3C0CDEF3-495E-45F4-8B12-0E05EF11295C}.Debug|ARM.Deploy.0 = Debug|Any CPU
-		{3C0CDEF3-495E-45F4-8B12-0E05EF11295C}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{3C0CDEF3-495E-45F4-8B12-0E05EF11295C}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{3C0CDEF3-495E-45F4-8B12-0E05EF11295C}.Debug|ARM64.Deploy.0 = Debug|Any CPU
-		{3C0CDEF3-495E-45F4-8B12-0E05EF11295C}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{3C0CDEF3-495E-45F4-8B12-0E05EF11295C}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{3C0CDEF3-495E-45F4-8B12-0E05EF11295C}.Debug|iPhone.Deploy.0 = Debug|Any CPU
-		{3C0CDEF3-495E-45F4-8B12-0E05EF11295C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{3C0CDEF3-495E-45F4-8B12-0E05EF11295C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{3C0CDEF3-495E-45F4-8B12-0E05EF11295C}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
-		{3C0CDEF3-495E-45F4-8B12-0E05EF11295C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3C0CDEF3-495E-45F4-8B12-0E05EF11295C}.Debug|x64.Build.0 = Debug|Any CPU
-		{3C0CDEF3-495E-45F4-8B12-0E05EF11295C}.Debug|x64.Deploy.0 = Debug|Any CPU
-		{3C0CDEF3-495E-45F4-8B12-0E05EF11295C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3C0CDEF3-495E-45F4-8B12-0E05EF11295C}.Debug|x86.Build.0 = Debug|Any CPU
-		{3C0CDEF3-495E-45F4-8B12-0E05EF11295C}.Debug|x86.Deploy.0 = Debug|Any CPU
-		{3C0CDEF3-495E-45F4-8B12-0E05EF11295C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3C0CDEF3-495E-45F4-8B12-0E05EF11295C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3C0CDEF3-495E-45F4-8B12-0E05EF11295C}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{3C0CDEF3-495E-45F4-8B12-0E05EF11295C}.Release|ARM.ActiveCfg = Release|Any CPU
-		{3C0CDEF3-495E-45F4-8B12-0E05EF11295C}.Release|ARM.Build.0 = Release|Any CPU
-		{3C0CDEF3-495E-45F4-8B12-0E05EF11295C}.Release|ARM.Deploy.0 = Release|Any CPU
-		{3C0CDEF3-495E-45F4-8B12-0E05EF11295C}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{3C0CDEF3-495E-45F4-8B12-0E05EF11295C}.Release|ARM64.Build.0 = Release|Any CPU
-		{3C0CDEF3-495E-45F4-8B12-0E05EF11295C}.Release|ARM64.Deploy.0 = Release|Any CPU
-		{3C0CDEF3-495E-45F4-8B12-0E05EF11295C}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{3C0CDEF3-495E-45F4-8B12-0E05EF11295C}.Release|iPhone.Build.0 = Release|Any CPU
-		{3C0CDEF3-495E-45F4-8B12-0E05EF11295C}.Release|iPhone.Deploy.0 = Release|Any CPU
-		{3C0CDEF3-495E-45F4-8B12-0E05EF11295C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{3C0CDEF3-495E-45F4-8B12-0E05EF11295C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{3C0CDEF3-495E-45F4-8B12-0E05EF11295C}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
-		{3C0CDEF3-495E-45F4-8B12-0E05EF11295C}.Release|x64.ActiveCfg = Release|Any CPU
-		{3C0CDEF3-495E-45F4-8B12-0E05EF11295C}.Release|x64.Build.0 = Release|Any CPU
-		{3C0CDEF3-495E-45F4-8B12-0E05EF11295C}.Release|x64.Deploy.0 = Release|Any CPU
-		{3C0CDEF3-495E-45F4-8B12-0E05EF11295C}.Release|x86.ActiveCfg = Release|Any CPU
-		{3C0CDEF3-495E-45F4-8B12-0E05EF11295C}.Release|x86.Build.0 = Release|Any CPU
-		{3C0CDEF3-495E-45F4-8B12-0E05EF11295C}.Release|x86.Deploy.0 = Release|Any CPU
-		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Debug|ARM.Build.0 = Debug|Any CPU
-		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Debug|x64.Build.0 = Debug|Any CPU
-		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Debug|x86.Build.0 = Debug|Any CPU
-		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Release|ARM.ActiveCfg = Release|Any CPU
-		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Release|ARM.Build.0 = Release|Any CPU
-		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Release|ARM64.Build.0 = Release|Any CPU
-		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Release|iPhone.Build.0 = Release|Any CPU
-		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Release|x64.ActiveCfg = Release|Any CPU
-		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Release|x64.Build.0 = Release|Any CPU
-		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Release|x86.ActiveCfg = Release|Any CPU
-		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Release|x86.Build.0 = Release|Any CPU
-		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Debug|ARM.Build.0 = Debug|Any CPU
-		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Debug|x64.Build.0 = Debug|Any CPU
-		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Debug|x86.Build.0 = Debug|Any CPU
-		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Release|ARM.ActiveCfg = Release|Any CPU
-		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Release|ARM.Build.0 = Release|Any CPU
-		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Release|ARM64.Build.0 = Release|Any CPU
-		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Release|iPhone.Build.0 = Release|Any CPU
-		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Release|x64.ActiveCfg = Release|Any CPU
-		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Release|x64.Build.0 = Release|Any CPU
-		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Release|x86.ActiveCfg = Release|Any CPU
-		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Release|x86.Build.0 = Release|Any CPU
 		{73100F0D-C0BB-4F16-8FC2-FA3FA8ACD424}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{73100F0D-C0BB-4F16-8FC2-FA3FA8ACD424}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{73100F0D-C0BB-4F16-8FC2-FA3FA8ACD424}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -1566,14 +1338,6 @@ Global
 		{2E0EB4A3-3C4A-4A5E-8D2F-F77C62464886} = {99FDF6CA-DCF8-4CB2-B2EA-E24CCB601232}
 		{B73EB308-70BE-49FD-91A7-1D1495663D6D} = {99FDF6CA-DCF8-4CB2-B2EA-E24CCB601232}
 		{81128D28-CFC8-4EA4-B68D-9939339C461A} = {99FDF6CA-DCF8-4CB2-B2EA-E24CCB601232}
-		{5817A848-0B04-4035-9F7E-B8621B61CBDD} = {DFD73007-5DB1-43AD-87A8-BD8622C2B192}
-		{5A1D97F2-6703-4278-BBF2-12C065F7E94A} = {5817A848-0B04-4035-9F7E-B8621B61CBDD}
-		{CFBEEB38-D3E8-4100-8CFB-E0A9C4FC0348} = {5817A848-0B04-4035-9F7E-B8621B61CBDD}
-		{89899D16-4BD1-49B1-9903-9F6BB26C5DC5} = {5817A848-0B04-4035-9F7E-B8621B61CBDD}
-		{AB6242B7-634F-4839-A991-7629D0D2C636} = {5817A848-0B04-4035-9F7E-B8621B61CBDD}
-		{3C0CDEF3-495E-45F4-8B12-0E05EF11295C} = {5817A848-0B04-4035-9F7E-B8621B61CBDD}
-		{2C69EB76-02C4-4921-96A1-4D70CB7CE744} = {5817A848-0B04-4035-9F7E-B8621B61CBDD}
-		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C} = {5817A848-0B04-4035-9F7E-B8621B61CBDD}
 		{73100F0D-C0BB-4F16-8FC2-FA3FA8ACD424} = {2ACC7FFA-238F-44FD-93CB-4D9B17D8C4BA}
 		{806499EB-C2CC-4E85-BC19-613F3DE5E0C3} = {9AD757F5-E57A-459D-A0A7-E0675E045B84}
 		{90B727DD-4C7B-4462-950F-61842A87DE8A} = {806499EB-C2CC-4E85-BC19-613F3DE5E0C3}
diff --git a/Directory.Build.props b/Directory.Build.props
index fbb320be4532..59ef2dcce4c1 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,12 +1,42 @@
 <Project>
   <Import Project="eng\Versions.props" />
+
   <PropertyGroup>
+
     <BuildForWinUI Condition="'$(SolutionFileName)' == 'Microsoft.Maui.WinUI.sln'">true</BuildForWinUI>
+    <BuildForAndroid Condition="'$(SolutionFileName)' == 'Microsoft.Maui.Droid.sln'">true</BuildForAndroid>
+    
     <BuildForNet6 Condition="'$(SolutionFileName)' == 'Microsoft.Maui-net6.sln' or '$(BuildForWinUI)' == 'true'">true</BuildForNet6>
     <MauiPlatforms>net6.0-ios;net6.0-maccatalyst;net6.0-android</MauiPlatforms>
     <WindowsTargetFramework Condition="'$(WindowsTargetFramework)' == ''">net6.0-windows10.0.18362</WindowsTargetFramework>
     <MauiPlatforms Condition="'$(Packing)' == 'true'">$(MauiPlatforms);$(WindowsTargetFramework)</MauiPlatforms>
     <MauiPlatforms Condition="'$(BuildForWinUI)' == 'true'">$(WindowsTargetFramework)</MauiPlatforms>
+    <MauiPlatforms Condition="'$(BuildForAndroid)' == 'true'">net6.0-android</MauiPlatforms>
+
+    <!-- This is used to easily build for a specific target to make the IDE work a bit better  -->   
+    <NonNet6Platforms>Xamarin.iOS10;MonoAndroid10.0</NonNet6Platforms>
+    <NonNet6EssentialsPlatforms>netstandard2.0;netstandard2.1;Xamarin.iOS10;MonoAndroid90;MonoAndroid10.0;tizen40;Xamarin.Mac20;</NonNet6EssentialsPlatforms>
+    <NonNet6EssentialsPlatforms Condition=" '$(OS)' == 'Windows_NT'">$(NonNet6EssentialsPlatforms);uap10.0.16299;</NonNet6EssentialsPlatforms>
+
+    <BuildNonNet6ForiOS>false</BuildNonNet6ForiOS>
+    <BuildNonNet6ForiOS Condition="'$(SolutionFileName)' == 'Microsoft.Maui.iOS.sln'">true</BuildNonNet6ForiOS>
+    <NonNet6Platforms Condition="'$(BuildNonNet6ForiOS)' == 'true'">Xamarin.iOS10</NonNet6Platforms>
+    <NonNet6EssentialsPlatforms Condition="'$(BuildNonNet6ForiOS)' == 'true'">netstandard2.0;netstandard2.1;Xamarin.iOS10</NonNet6EssentialsPlatforms>
+
+    <BuildNonNet6ForAndroid>false</BuildNonNet6ForAndroid>
+    <NonNet6Platforms Condition="'$(BuildNonNet6ForAndroid)' == 'true'">MonoAndroid10.0</NonNet6Platforms>
+    <NonNet6EssentialsPlatforms Condition="'$(BuildNonNet6ForAndroid)' == 'true'">netstandard2.0;netstandard2.1;MonoAndroid10.0</NonNet6EssentialsPlatforms>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <DotNetOutputPath>$(MSBuildThisFileDirectory)bin/</DotNetOutputPath>
+    <DotNetTempDirectory>$(DotNetOutputPath)temp/</DotNetTempDirectory>
+    <DotNetDirectory>$(DotNetOutputPath)dotnet/</DotNetDirectory>
+    <DotNetToolPath>$(DotNetDirectory)dotnet</DotNetToolPath>
+    <DotNetPacksDirectory>$(DotNetDirectory)packs/</DotNetPacksDirectory>
+    <DotNetSdkManifestsDirectory>$(DotNetDirectory)sdk-manifests/$(DotNetPreviewVersionBand)/</DotNetSdkManifestsDirectory>
     <_MauiBuildTasksLocation>$(_MauiBuildTasksLocation)</_MauiBuildTasksLocation>
     <_MauiBuildTasksLocation Condition="'$(_MauiBuildTasksLocation)' == ''">$(MSBuildThisFileDirectory).nuspec\</_MauiBuildTasksLocation>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
diff --git a/Directory.Build.targets b/Directory.Build.targets
index ddf229a497b9..2115a542b396 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -3,4 +3,17 @@
   <Import Condition="'$(SampleProject)' != 'true' and '$(CI)' == 'true' " Project="eng\Versions.targets" />
   <Import Project="eng\AndroidX.targets" />
   <Import Project="eng\Microsoft.Extensions.targets" />
-</Project>
+
+  <!-- Temporarily disable the linker for net6.0-ios and net6.0-maccatalyst until we get machine pools with Big Sur and Xcode 12.5 is stable -->
+  <PropertyGroup>
+    <PublishTrimmed Condition=" '$(TargetFramework)' == 'net6.0-ios' or '$(TargetFramework)' == 'net6.0-maccatalyst' ">false</PublishTrimmed>
+  </PropertyGroup>
+
+  <Target Name="Net6WinUIPackagingWorkaround" BeforeTargets="GetPackagingOutputs" Condition="$(TargetFramework.Contains('-windows')) == true AND '$(DisableEmbeddedXbf)' != 'true' ">
+    <PropertyGroup>
+      <TargetPlatformIdentifierAdjusted>UAP</TargetPlatformIdentifierAdjusted>
+      <_SupportEmbedFileResources>true</_SupportEmbedFileResources>
+      <_EmbedFileResfilePath>$(IntermediateOutputPath)$(AppxSubfolderWithFilesToBeEmbedded)\embed.resfiles</_EmbedFileResfilePath>
+    </PropertyGroup>
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/GitInfo.txt b/GitInfo.txt
index c6c5412ec7c2..554a08ec4b82 100644
--- a/GitInfo.txt
+++ b/GitInfo.txt
@@ -1 +1 @@
-6.0.100-preview.3
+6.0.100-ci.main
diff --git a/Microsoft.Maui-net6.sln b/Microsoft.Maui-net6.sln
index e0ebda8da5e3..315d123b65b1 100644
--- a/Microsoft.Maui-net6.sln
+++ b/Microsoft.Maui-net6.sln
@@ -66,7 +66,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Templates", "Templates", "{
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BlazorWebView", "BlazorWebView", "{1614D1A4-5C3D-4D5B-8C89-426E37A564EF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "core", "src\BlazorWebView\src\core\Microsoft.AspNetCore.Components.WebView.Maui.csproj", "{F7F2B379-52CE-4802-9EC9-0D7967B6BFB7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.WebView.Maui", "src\BlazorWebView\src\core\Microsoft.AspNetCore.Components.WebView.Maui.csproj", "{F7F2B379-52CE-4802-9EC9-0D7967B6BFB7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.Core.Design-net6", "src\Controls\src\Core.Design\Controls.Core.Design-net6.csproj", "{F2A419ED-B18E-4075-9969-536C2EC67F82}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.Xaml.Design-net6", "src\Controls\src\Xaml.Design\Controls.Xaml.Design-net6.csproj", "{F9AEE4C0-9E67-4B87-932E-26EDF0FC932A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -149,6 +153,14 @@ Global
 		{F7F2B379-52CE-4802-9EC9-0D7967B6BFB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F7F2B379-52CE-4802-9EC9-0D7967B6BFB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F7F2B379-52CE-4802-9EC9-0D7967B6BFB7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F2A419ED-B18E-4075-9969-536C2EC67F82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F2A419ED-B18E-4075-9969-536C2EC67F82}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F2A419ED-B18E-4075-9969-536C2EC67F82}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F2A419ED-B18E-4075-9969-536C2EC67F82}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F9AEE4C0-9E67-4B87-932E-26EDF0FC932A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F9AEE4C0-9E67-4B87-932E-26EDF0FC932A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F9AEE4C0-9E67-4B87-932E-26EDF0FC932A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F9AEE4C0-9E67-4B87-932E-26EDF0FC932A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -175,6 +187,8 @@ Global
 		{C564DDD6-DE79-45CD-88EA-3F690481572A} = {09C264E9-E3F3-4586-9151-DCBB1F6DA7AB}
 		{50C758FE-4E10-409A-94F5-A75480960864} = {459BF674-83CB-46F6-881F-A2D2117DBF4D}
 		{F7F2B379-52CE-4802-9EC9-0D7967B6BFB7} = {1614D1A4-5C3D-4D5B-8C89-426E37A564EF}
+		{F2A419ED-B18E-4075-9969-536C2EC67F82} = {50C758FE-4E10-409A-94F5-A75480960864}
+		{F9AEE4C0-9E67-4B87-932E-26EDF0FC932A} = {50C758FE-4E10-409A-94F5-A75480960864}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {0B8ABEAD-D2B5-4370-A187-62B5ABE4EE50}
diff --git a/Microsoft.Maui.Droid.sln b/Microsoft.Maui.Droid.sln
new file mode 100644
index 000000000000..2709a258012f
--- /dev/null
+++ b/Microsoft.Maui.Droid.sln
@@ -0,0 +1,159 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30926.220
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core-net6", "src\Core\src\Core-net6.csproj", "{95BA42B5-B00E-4986-B9B5-517140378452}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Files", "Files", "{449F6071-A74F-4309-8D7B-7038CFD1B17B}"
+	ProjectSection(SolutionItems) = preProject
+		.nuspec\Microsoft.Maui.Controls.MultiTargeting.targets = .nuspec\Microsoft.Maui.Controls.MultiTargeting.targets
+		README.md = README.md
+	EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.Core-net6", "src\Controls\src\Core\Controls.Core-net6.csproj", "{AF64451F-E2BD-41C2-B083-F60C26AE2A9F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Compatibility-net6", "src\Compatibility\Core\src\Compatibility-net6.csproj", "{00A11C2F-969F-4964-8557-91ADF4B1523D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Compatibility.Android.FormsViewGroup-net6", "src\Compatibility\Core\src\Android.FormsViewGroup\Compatibility.Android.FormsViewGroup-net6.csproj", "{EB956381-F3E6-437C-9069-36B8BF5C6E2F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Controls", "Controls", "{459BF674-83CB-46F6-881F-A2D2117DBF4D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{E1082E26-D700-4127-9329-66D673FD2D55}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maui.Controls.Sample-net6", "src\Controls\samples\Controls.Sample\Maui.Controls.Sample-net6.csproj", "{B8DC1324-977C-46F1-B697-9064ADE6099A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maui.Controls.Sample.Droid-net6", "src\Controls\samples\Controls.Sample.Droid\Maui.Controls.Sample.Droid-net6.csproj", "{BE50FAEF-4096-48B5-B9CE-EE0C38F15A18}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Compatibility", "Compatibility", "{123AA89E-1638-4E0E-B828-B8F9F9F906A2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{09C264E9-E3F3-4586-9151-DCBB1F6DA7AB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.Build.Tasks-net6", "src\Controls\src\Build.Tasks\Controls.Build.Tasks-net6.csproj", "{75C380E0-CE53-4C01-B89F-CF685331DE18}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Essentials", "Essentials", "{94F3C036-A5F4-4ACC-A028-8506802ADB88}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Essentials-net6", "src\Essentials\src\Essentials-net6.csproj", "{39B47A3C-21CA-4B28-9250-14FD957EB0FC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SingleProject", "SingleProject", "{D5478E0A-5D9C-4C1F-980C-7A9FC71F925E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Resizetizer", "src\SingleProject\Resizetizer\src\Resizetizer.csproj", "{9909F93F-C085-4F76-B92A-5D8C516BF47D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Package-net6", "src\Package\Package-net6.csproj", "{5BEB3326-79B4-438C-BF65-274202F387EC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.Xaml-net6", "src\Controls\src\Xaml\Controls.Xaml-net6.csproj", "{CC3D4667-D94E-4276-9311-6439BFD075E4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Maui.Templates", "src\Templates\src\Microsoft.Maui.Templates.csproj", "{DAAC2822-63B6-4DE0-83AE-04873CD2F364}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestUtils", "TestUtils", "{6998CAA1-11D4-46B2-B80F-0AC882F58124}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtils", "src\TestUtils\TestUtils\src\TestUtils.csproj", "{FBB3270F-1924-4A72-845E-A6DF39C402F6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.UnitTests", "src\Core\tests\UnitTests\Core.UnitTests.csproj", "{92644F6F-5946-48FC-A21A-A3D6EE24E8B3}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E8AD265B-3C67-4640-AC58-A522F9FB3361}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{C564DDD6-DE79-45CD-88EA-3F690481572A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{50C758FE-4E10-409A-94F5-A75480960864}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Templates", "Templates", "{72397ADB-40A8-4B8E-8E08-2DBE2803C845}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BlazorWebView", "BlazorWebView", "{1614D1A4-5C3D-4D5B-8C89-426E37A564EF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.WebView.Maui", "src\BlazorWebView\src\core\Microsoft.AspNetCore.Components.WebView.Maui.csproj", "{F7F2B379-52CE-4802-9EC9-0D7967B6BFB7}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{95BA42B5-B00E-4986-B9B5-517140378452}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{95BA42B5-B00E-4986-B9B5-517140378452}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{95BA42B5-B00E-4986-B9B5-517140378452}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{95BA42B5-B00E-4986-B9B5-517140378452}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AF64451F-E2BD-41C2-B083-F60C26AE2A9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AF64451F-E2BD-41C2-B083-F60C26AE2A9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AF64451F-E2BD-41C2-B083-F60C26AE2A9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AF64451F-E2BD-41C2-B083-F60C26AE2A9F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{00A11C2F-969F-4964-8557-91ADF4B1523D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{00A11C2F-969F-4964-8557-91ADF4B1523D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{00A11C2F-969F-4964-8557-91ADF4B1523D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{00A11C2F-969F-4964-8557-91ADF4B1523D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EB956381-F3E6-437C-9069-36B8BF5C6E2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB956381-F3E6-437C-9069-36B8BF5C6E2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EB956381-F3E6-437C-9069-36B8BF5C6E2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EB956381-F3E6-437C-9069-36B8BF5C6E2F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B8DC1324-977C-46F1-B697-9064ADE6099A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B8DC1324-977C-46F1-B697-9064ADE6099A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B8DC1324-977C-46F1-B697-9064ADE6099A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B8DC1324-977C-46F1-B697-9064ADE6099A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BE50FAEF-4096-48B5-B9CE-EE0C38F15A18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BE50FAEF-4096-48B5-B9CE-EE0C38F15A18}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BE50FAEF-4096-48B5-B9CE-EE0C38F15A18}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{BE50FAEF-4096-48B5-B9CE-EE0C38F15A18}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BE50FAEF-4096-48B5-B9CE-EE0C38F15A18}.Release|Any CPU.Build.0 = Release|Any CPU
+		{75C380E0-CE53-4C01-B89F-CF685331DE18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{75C380E0-CE53-4C01-B89F-CF685331DE18}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{75C380E0-CE53-4C01-B89F-CF685331DE18}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{75C380E0-CE53-4C01-B89F-CF685331DE18}.Release|Any CPU.Build.0 = Release|Any CPU
+		{39B47A3C-21CA-4B28-9250-14FD957EB0FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{39B47A3C-21CA-4B28-9250-14FD957EB0FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{39B47A3C-21CA-4B28-9250-14FD957EB0FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{39B47A3C-21CA-4B28-9250-14FD957EB0FC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9909F93F-C085-4F76-B92A-5D8C516BF47D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9909F93F-C085-4F76-B92A-5D8C516BF47D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9909F93F-C085-4F76-B92A-5D8C516BF47D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9909F93F-C085-4F76-B92A-5D8C516BF47D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5BEB3326-79B4-438C-BF65-274202F387EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5BEB3326-79B4-438C-BF65-274202F387EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5BEB3326-79B4-438C-BF65-274202F387EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5BEB3326-79B4-438C-BF65-274202F387EC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CC3D4667-D94E-4276-9311-6439BFD075E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CC3D4667-D94E-4276-9311-6439BFD075E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CC3D4667-D94E-4276-9311-6439BFD075E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CC3D4667-D94E-4276-9311-6439BFD075E4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DAAC2822-63B6-4DE0-83AE-04873CD2F364}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DAAC2822-63B6-4DE0-83AE-04873CD2F364}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DAAC2822-63B6-4DE0-83AE-04873CD2F364}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DAAC2822-63B6-4DE0-83AE-04873CD2F364}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FBB3270F-1924-4A72-845E-A6DF39C402F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FBB3270F-1924-4A72-845E-A6DF39C402F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FBB3270F-1924-4A72-845E-A6DF39C402F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FBB3270F-1924-4A72-845E-A6DF39C402F6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{92644F6F-5946-48FC-A21A-A3D6EE24E8B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{92644F6F-5946-48FC-A21A-A3D6EE24E8B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{92644F6F-5946-48FC-A21A-A3D6EE24E8B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{92644F6F-5946-48FC-A21A-A3D6EE24E8B3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F7F2B379-52CE-4802-9EC9-0D7967B6BFB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F7F2B379-52CE-4802-9EC9-0D7967B6BFB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F7F2B379-52CE-4802-9EC9-0D7967B6BFB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F7F2B379-52CE-4802-9EC9-0D7967B6BFB7}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{95BA42B5-B00E-4986-B9B5-517140378452} = {E8AD265B-3C67-4640-AC58-A522F9FB3361}
+		{AF64451F-E2BD-41C2-B083-F60C26AE2A9F} = {50C758FE-4E10-409A-94F5-A75480960864}
+		{00A11C2F-969F-4964-8557-91ADF4B1523D} = {123AA89E-1638-4E0E-B828-B8F9F9F906A2}
+		{EB956381-F3E6-437C-9069-36B8BF5C6E2F} = {123AA89E-1638-4E0E-B828-B8F9F9F906A2}
+		{E1082E26-D700-4127-9329-66D673FD2D55} = {459BF674-83CB-46F6-881F-A2D2117DBF4D}
+		{B8DC1324-977C-46F1-B697-9064ADE6099A} = {E1082E26-D700-4127-9329-66D673FD2D55}
+		{BE50FAEF-4096-48B5-B9CE-EE0C38F15A18} = {E1082E26-D700-4127-9329-66D673FD2D55}
+		{75C380E0-CE53-4C01-B89F-CF685331DE18} = {50C758FE-4E10-409A-94F5-A75480960864}
+		{39B47A3C-21CA-4B28-9250-14FD957EB0FC} = {94F3C036-A5F4-4ACC-A028-8506802ADB88}
+		{9909F93F-C085-4F76-B92A-5D8C516BF47D} = {D5478E0A-5D9C-4C1F-980C-7A9FC71F925E}
+		{CC3D4667-D94E-4276-9311-6439BFD075E4} = {50C758FE-4E10-409A-94F5-A75480960864}
+		{DAAC2822-63B6-4DE0-83AE-04873CD2F364} = {72397ADB-40A8-4B8E-8E08-2DBE2803C845}
+		{FBB3270F-1924-4A72-845E-A6DF39C402F6} = {6998CAA1-11D4-46B2-B80F-0AC882F58124}
+		{92644F6F-5946-48FC-A21A-A3D6EE24E8B3} = {C564DDD6-DE79-45CD-88EA-3F690481572A}
+		{E8AD265B-3C67-4640-AC58-A522F9FB3361} = {09C264E9-E3F3-4586-9151-DCBB1F6DA7AB}
+		{C564DDD6-DE79-45CD-88EA-3F690481572A} = {09C264E9-E3F3-4586-9151-DCBB1F6DA7AB}
+		{50C758FE-4E10-409A-94F5-A75480960864} = {459BF674-83CB-46F6-881F-A2D2117DBF4D}
+		{F7F2B379-52CE-4802-9EC9-0D7967B6BFB7} = {1614D1A4-5C3D-4D5B-8C89-426E37A564EF}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {0B8ABEAD-D2B5-4370-A187-62B5ABE4EE50}
+	EndGlobalSection
+EndGlobal
diff --git a/Microsoft.Maui.iOS.sln b/Microsoft.Maui.iOS.sln
new file mode 100644
index 000000000000..30a61733db1c
--- /dev/null
+++ b/Microsoft.Maui.iOS.sln
@@ -0,0 +1,979 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30503.244
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Controls", "Controls", "{9AD757F5-E57A-459D-A0A7-E0675E045B84}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Compatibility", "Compatibility", "{29AC50BF-B4FB-450B-9386-0C5AD4B84226}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuspec", ".nuspec", "{7E12C50D-A570-4DF1-94E1-8599843FA87C}"
+	ProjectSection(SolutionItems) = preProject
+		eng\dogfood.ps1 = eng\dogfood.ps1
+		.nuspec\Microsoft.Maui.Controls.Compatibility.AppLinks.nuspec = .nuspec\Microsoft.Maui.Controls.Compatibility.AppLinks.nuspec
+		.nuspec\Microsoft.Maui.Controls.Compatibility.GTK.nuspec = .nuspec\Microsoft.Maui.Controls.Compatibility.GTK.nuspec
+		.nuspec\Microsoft.Maui.Controls.Compatibility.Maps.GTK.nuspec = .nuspec\Microsoft.Maui.Controls.Compatibility.Maps.GTK.nuspec
+		.nuspec\Microsoft.Maui.Controls.Compatibility.Maps.nuspec = .nuspec\Microsoft.Maui.Controls.Compatibility.Maps.nuspec
+		.nuspec\Microsoft.Maui.Controls.Compatibility.Maps.WPF.nuspec = .nuspec\Microsoft.Maui.Controls.Compatibility.Maps.WPF.nuspec
+		.nuspec\Microsoft.Maui.Controls.Compatibility.Visual.Material.nuspec = .nuspec\Microsoft.Maui.Controls.Compatibility.Visual.Material.nuspec
+		.nuspec\Microsoft.Maui.Controls.Compatibility.Visual.Material.targets = .nuspec\Microsoft.Maui.Controls.Compatibility.Visual.Material.targets
+		.nuspec\Microsoft.Maui.Controls.Compatibility.WPF.nuspec = .nuspec\Microsoft.Maui.Controls.Compatibility.WPF.nuspec
+		.nuspec\Microsoft.Maui.Controls.Debug.targets = .nuspec\Microsoft.Maui.Controls.Debug.targets
+		.nuspec\Microsoft.Maui.Controls.DefaultItems.props = .nuspec\Microsoft.Maui.Controls.DefaultItems.props
+		.nuspec\Microsoft.Maui.Controls.DefaultItems.targets = .nuspec\Microsoft.Maui.Controls.DefaultItems.targets
+		.nuspec\Microsoft.Maui.Controls.DualScreen.nuspec = .nuspec\Microsoft.Maui.Controls.DualScreen.nuspec
+		.nuspec\Microsoft.Maui.Controls.MultiTargeting.targets = .nuspec\Microsoft.Maui.Controls.MultiTargeting.targets
+		.nuspec\Microsoft.Maui.Controls.nuspec = .nuspec\Microsoft.Maui.Controls.nuspec
+		.nuspec\Microsoft.Maui.Controls.props = .nuspec\Microsoft.Maui.Controls.props
+		.nuspec\Microsoft.Maui.Controls.SingleProject.props = .nuspec\Microsoft.Maui.Controls.SingleProject.props
+		.nuspec\Microsoft.Maui.Controls.SingleProject.targets = .nuspec\Microsoft.Maui.Controls.SingleProject.targets
+		.nuspec\Microsoft.Maui.Controls.targets = .nuspec\Microsoft.Maui.Controls.targets
+		.nuspec\Microsoft.Maui.Resizetizer.targets = .nuspec\Microsoft.Maui.Resizetizer.targets
+		eng\package.ps1 = eng\package.ps1
+		.nuspec\proguard.cfg = .nuspec\proguard.cfg
+	EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.Core", "src\Controls\src\Core\Controls.Core.csproj", "{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{31721EFD-3238-462B-B501-41F3D2B50E92}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Controls", "Controls", "{97FA536A-675D-41C7-A90E-97E2F79D1AE2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{423C21C8-84CB-4A3C-BEB9-1C23D752D90F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{2ACC7FFA-238F-44FD-93CB-4D9B17D8C4BA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core", "src\Core\src\Core.csproj", "{29913989-0F70-48D8-8EDE-B1DD217F21D1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Compatibility.iOS", "src\Compatibility\Core\src\iOS\Compatibility.iOS.csproj", "{271193C1-6E7C-429C-A36D-3F1BE5267231}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D5B986A3-7FC9-437E-8030-349AA4698DFD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{75A2CD30-BB85-4CA6-AC95-86A8A538A690}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.Core.UnitTests", "src\Controls\tests\Core.UnitTests\Controls.Core.UnitTests.csproj", "{00259593-A283-47A5-ACB7-9C3819B16364}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.Xaml", "src\Controls\src\Xaml\Controls.Xaml.csproj", "{BB98A559-62C4-4C98-90A0-9E4D8DF1CA27}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.Build.Tasks", "src\Controls\src\Build.Tasks\Controls.Build.Tasks.csproj", "{C328C538-B69F-43D2-80EE-3C1EB8254CBA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.UnitTests", "src\Core\tests\UnitTests\Core.UnitTests.csproj", "{7A753001-1C3D-404D-A421-2E052A545EAC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.DeviceTests", "src\Core\tests\DeviceTests\Core.DeviceTests.csproj", "{DA9E4D76-8CA4-4CC3-A47C-BA75DFF805C6}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.DeviceTests.Android", "src\Core\tests\DeviceTests.Android\Core.DeviceTests.Android.csproj", "{A0B8D99F-4C0E-4D47-8182-9E8879A9B105}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.DeviceTests.iOS", "src\Core\tests\DeviceTests.iOS\Core.DeviceTests.iOS.csproj", "{EE8FC716-27FC-405B-BD27-AF17E01A6671}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Essentials", "Essentials", "{DFD73007-5DB1-43AD-87A8-BD8622C2B192}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7E12E071-51C0-4668-9FF3-E2DE9DC51962}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Essentials", "src\Essentials\src\Essentials.csproj", "{8CB95D25-8442-42BC-82BE-319D21138549}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{99FDF6CA-DCF8-4CB2-B2EA-E24CCB601232}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Essentials.UnitTests", "src\Essentials\test\UnitTests\Essentials.UnitTests.csproj", "{2E0EB4A3-3C4A-4A5E-8D2F-F77C62464886}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Essentials.DeviceTests.iOS", "src\Essentials\test\DeviceTests.iOS\Essentials.DeviceTests.iOS.csproj", "{B73EB308-70BE-49FD-91A7-1D1495663D6D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Essentials.DeviceTests.Shared", "src\Essentials\test\DeviceTests.Shared\Essentials.DeviceTests.Shared.csproj", "{81128D28-CFC8-4EA4-B68D-9939339C461A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{5817A848-0B04-4035-9F7E-B8621B61CBDD}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Essentials.Samples.iOS", "src\Essentials\samples\Samples.iOS\Essentials.Samples.iOS.csproj", "{AB6242B7-634F-4839-A991-7629D0D2C636}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Essentials.Samples", "src\Essentials\samples\Samples\Essentials.Samples.csproj", "{2C69EB76-02C4-4921-96A1-4D70CB7CE744}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Essentials.Sample.Server.WebAuthenticator", "src\Essentials\samples\Sample.Server.WebAuthenticator\Essentials.Sample.Server.WebAuthenticator.csproj", "{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.Benchmarks", "src\Core\tests\Benchmarks\Core.Benchmarks.csproj", "{73100F0D-C0BB-4F16-8FC2-FA3FA8ACD424}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{806499EB-C2CC-4E85-BC19-613F3DE5E0C3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.Sample", "src\Controls\samples\Controls.Sample\Controls.Sample.csproj", "{90B727DD-4C7B-4462-950F-61842A87DE8A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Controls.Sample.iOS", "src\Controls\samples\Controls.Sample.iOS\Controls.Sample.iOS.csproj", "{D51AD52D-C4C6-445A-BD0F-884BE5C1C526}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.Maps", "src\Controls\Maps\src\Controls.Maps.csproj", "{F2379E0F-524F-47BC-877C-0428E4C836D4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.Xaml.UnitTests", "src\Controls\tests\Xaml.UnitTests\Controls.Xaml.UnitTests.csproj", "{F905B72C-4DF7-408B-8B2B-50F9B8246A5E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestUtils", "TestUtils", "{0F9BA970-11B1-4ACA-AF41-1021AFC0F29C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtils", "src\TestUtils\TestUtils\src\TestUtils.csproj", "{E4CB9988-7348-4D55-A08E-85907732F8DA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtils.DeviceTests", "src\TestUtils\TestUtils.DeviceTests\src\TestUtils.DeviceTests.csproj", "{551B2209-4298-4D60-B55C-79077B8BC244}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Resizetizer", "Resizetizer", "{4A3BAF64-E9D9-4036-9FDA-8B326C382667}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{F83AC93C-9694-4A01-B9CB-7AA8E514B01F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{08F720FF-7530-43BF-A252-8946927669E3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Resizetizer", "src\SingleProject\Resizetizer\src\Resizetizer.csproj", "{3E1D0DED-6B13-42C8-AA15-2EDFD8ECE80C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Resizetizer.UnitTests", "src\SingleProject\Resizetizer\test\UnitTests\Resizetizer.UnitTests.csproj", "{BDFA84D6-6C6B-44C9-ABC5-563CFD0C4DB5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SingleProject", "SingleProject", "{15878D2D-B0F1-4EE9-875D-4A643DB0C842}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.CustomAttributes", "src\Controls\tests\CustomAttributes\Controls.CustomAttributes.csproj", "{D816B818-F58F-4738-93AE-924EFAB7A07F}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Compatibility.ControlGallery.Issues.Shared", "src\Compatibility\ControlGallery\src\Issues.Shared\Compatibility.ControlGallery.Issues.Shared.shproj", "{AE2513CB-4E5E-4E5C-8237-88954D4C9433}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Compatibility.ControlGallery.Core", "src\Compatibility\ControlGallery\src\Core\Compatibility.ControlGallery.Core.csproj", "{B5F94CCB-5868-43BD-89B5-B66C97C3A741}"
+EndProject
+Global
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		src\Compatibility\ControlGallery\src\Issues.Shared\Compatibility.ControlGallery.Issues.Shared.projitems*{ae2513cb-4e5e-4e5c-8237-88954d4c9433}*SharedItemsImports = 13
+		src\Compatibility\ControlGallery\src\Issues.Shared\Compatibility.ControlGallery.Issues.Shared.projitems*{b5f94ccb-5868-43bd-89b5-b66c97c3a741}*SharedItemsImports = 5
+	EndGlobalSection
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|ARM = Debug|ARM
+		Debug|ARM64 = Debug|ARM64
+		Debug|iPhone = Debug|iPhone
+		Debug|iPhoneSimulator = Debug|iPhoneSimulator
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|ARM = Release|ARM
+		Release|ARM64 = Release|ARM64
+		Release|iPhone = Release|iPhone
+		Release|iPhoneSimulator = Release|iPhoneSimulator
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Debug|ARM.Build.0 = Debug|Any CPU
+		{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Debug|x64.Build.0 = Debug|Any CPU
+		{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Debug|x86.Build.0 = Debug|Any CPU
+		{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Release|ARM.ActiveCfg = Release|Any CPU
+		{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Release|ARM.Build.0 = Release|Any CPU
+		{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Release|ARM64.Build.0 = Release|Any CPU
+		{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Release|iPhone.Build.0 = Release|Any CPU
+		{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Release|x64.ActiveCfg = Release|Any CPU
+		{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Release|x64.Build.0 = Release|Any CPU
+		{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Release|x86.ActiveCfg = Release|Any CPU
+		{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}.Release|x86.Build.0 = Release|Any CPU
+		{29913989-0F70-48D8-8EDE-B1DD217F21D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{29913989-0F70-48D8-8EDE-B1DD217F21D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{29913989-0F70-48D8-8EDE-B1DD217F21D1}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{29913989-0F70-48D8-8EDE-B1DD217F21D1}.Debug|ARM.Build.0 = Debug|Any CPU
+		{29913989-0F70-48D8-8EDE-B1DD217F21D1}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{29913989-0F70-48D8-8EDE-B1DD217F21D1}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{29913989-0F70-48D8-8EDE-B1DD217F21D1}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{29913989-0F70-48D8-8EDE-B1DD217F21D1}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{29913989-0F70-48D8-8EDE-B1DD217F21D1}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{29913989-0F70-48D8-8EDE-B1DD217F21D1}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{29913989-0F70-48D8-8EDE-B1DD217F21D1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{29913989-0F70-48D8-8EDE-B1DD217F21D1}.Debug|x64.Build.0 = Debug|Any CPU
+		{29913989-0F70-48D8-8EDE-B1DD217F21D1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{29913989-0F70-48D8-8EDE-B1DD217F21D1}.Debug|x86.Build.0 = Debug|Any CPU
+		{29913989-0F70-48D8-8EDE-B1DD217F21D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{29913989-0F70-48D8-8EDE-B1DD217F21D1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{29913989-0F70-48D8-8EDE-B1DD217F21D1}.Release|ARM.ActiveCfg = Release|Any CPU
+		{29913989-0F70-48D8-8EDE-B1DD217F21D1}.Release|ARM.Build.0 = Release|Any CPU
+		{29913989-0F70-48D8-8EDE-B1DD217F21D1}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{29913989-0F70-48D8-8EDE-B1DD217F21D1}.Release|ARM64.Build.0 = Release|Any CPU
+		{29913989-0F70-48D8-8EDE-B1DD217F21D1}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{29913989-0F70-48D8-8EDE-B1DD217F21D1}.Release|iPhone.Build.0 = Release|Any CPU
+		{29913989-0F70-48D8-8EDE-B1DD217F21D1}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{29913989-0F70-48D8-8EDE-B1DD217F21D1}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{29913989-0F70-48D8-8EDE-B1DD217F21D1}.Release|x64.ActiveCfg = Release|Any CPU
+		{29913989-0F70-48D8-8EDE-B1DD217F21D1}.Release|x64.Build.0 = Release|Any CPU
+		{29913989-0F70-48D8-8EDE-B1DD217F21D1}.Release|x86.ActiveCfg = Release|Any CPU
+		{29913989-0F70-48D8-8EDE-B1DD217F21D1}.Release|x86.Build.0 = Release|Any CPU
+		{271193C1-6E7C-429C-A36D-3F1BE5267231}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{271193C1-6E7C-429C-A36D-3F1BE5267231}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{271193C1-6E7C-429C-A36D-3F1BE5267231}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{271193C1-6E7C-429C-A36D-3F1BE5267231}.Debug|ARM.Build.0 = Debug|Any CPU
+		{271193C1-6E7C-429C-A36D-3F1BE5267231}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{271193C1-6E7C-429C-A36D-3F1BE5267231}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{271193C1-6E7C-429C-A36D-3F1BE5267231}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{271193C1-6E7C-429C-A36D-3F1BE5267231}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{271193C1-6E7C-429C-A36D-3F1BE5267231}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{271193C1-6E7C-429C-A36D-3F1BE5267231}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{271193C1-6E7C-429C-A36D-3F1BE5267231}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{271193C1-6E7C-429C-A36D-3F1BE5267231}.Debug|x64.Build.0 = Debug|Any CPU
+		{271193C1-6E7C-429C-A36D-3F1BE5267231}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{271193C1-6E7C-429C-A36D-3F1BE5267231}.Debug|x86.Build.0 = Debug|Any CPU
+		{271193C1-6E7C-429C-A36D-3F1BE5267231}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{271193C1-6E7C-429C-A36D-3F1BE5267231}.Release|Any CPU.Build.0 = Release|Any CPU
+		{271193C1-6E7C-429C-A36D-3F1BE5267231}.Release|ARM.ActiveCfg = Release|Any CPU
+		{271193C1-6E7C-429C-A36D-3F1BE5267231}.Release|ARM.Build.0 = Release|Any CPU
+		{271193C1-6E7C-429C-A36D-3F1BE5267231}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{271193C1-6E7C-429C-A36D-3F1BE5267231}.Release|ARM64.Build.0 = Release|Any CPU
+		{271193C1-6E7C-429C-A36D-3F1BE5267231}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{271193C1-6E7C-429C-A36D-3F1BE5267231}.Release|iPhone.Build.0 = Release|Any CPU
+		{271193C1-6E7C-429C-A36D-3F1BE5267231}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{271193C1-6E7C-429C-A36D-3F1BE5267231}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{271193C1-6E7C-429C-A36D-3F1BE5267231}.Release|x64.ActiveCfg = Release|Any CPU
+		{271193C1-6E7C-429C-A36D-3F1BE5267231}.Release|x64.Build.0 = Release|Any CPU
+		{271193C1-6E7C-429C-A36D-3F1BE5267231}.Release|x86.ActiveCfg = Release|Any CPU
+		{271193C1-6E7C-429C-A36D-3F1BE5267231}.Release|x86.Build.0 = Release|Any CPU
+		{00259593-A283-47A5-ACB7-9C3819B16364}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{00259593-A283-47A5-ACB7-9C3819B16364}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{00259593-A283-47A5-ACB7-9C3819B16364}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{00259593-A283-47A5-ACB7-9C3819B16364}.Debug|ARM.Build.0 = Debug|Any CPU
+		{00259593-A283-47A5-ACB7-9C3819B16364}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{00259593-A283-47A5-ACB7-9C3819B16364}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{00259593-A283-47A5-ACB7-9C3819B16364}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{00259593-A283-47A5-ACB7-9C3819B16364}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{00259593-A283-47A5-ACB7-9C3819B16364}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{00259593-A283-47A5-ACB7-9C3819B16364}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{00259593-A283-47A5-ACB7-9C3819B16364}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{00259593-A283-47A5-ACB7-9C3819B16364}.Debug|x64.Build.0 = Debug|Any CPU
+		{00259593-A283-47A5-ACB7-9C3819B16364}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{00259593-A283-47A5-ACB7-9C3819B16364}.Debug|x86.Build.0 = Debug|Any CPU
+		{00259593-A283-47A5-ACB7-9C3819B16364}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{00259593-A283-47A5-ACB7-9C3819B16364}.Release|Any CPU.Build.0 = Release|Any CPU
+		{00259593-A283-47A5-ACB7-9C3819B16364}.Release|ARM.ActiveCfg = Release|Any CPU
+		{00259593-A283-47A5-ACB7-9C3819B16364}.Release|ARM.Build.0 = Release|Any CPU
+		{00259593-A283-47A5-ACB7-9C3819B16364}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{00259593-A283-47A5-ACB7-9C3819B16364}.Release|ARM64.Build.0 = Release|Any CPU
+		{00259593-A283-47A5-ACB7-9C3819B16364}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{00259593-A283-47A5-ACB7-9C3819B16364}.Release|iPhone.Build.0 = Release|Any CPU
+		{00259593-A283-47A5-ACB7-9C3819B16364}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{00259593-A283-47A5-ACB7-9C3819B16364}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{00259593-A283-47A5-ACB7-9C3819B16364}.Release|x64.ActiveCfg = Release|Any CPU
+		{00259593-A283-47A5-ACB7-9C3819B16364}.Release|x64.Build.0 = Release|Any CPU
+		{00259593-A283-47A5-ACB7-9C3819B16364}.Release|x86.ActiveCfg = Release|Any CPU
+		{00259593-A283-47A5-ACB7-9C3819B16364}.Release|x86.Build.0 = Release|Any CPU
+		{BB98A559-62C4-4C98-90A0-9E4D8DF1CA27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BB98A559-62C4-4C98-90A0-9E4D8DF1CA27}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BB98A559-62C4-4C98-90A0-9E4D8DF1CA27}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{BB98A559-62C4-4C98-90A0-9E4D8DF1CA27}.Debug|ARM.Build.0 = Debug|Any CPU
+		{BB98A559-62C4-4C98-90A0-9E4D8DF1CA27}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{BB98A559-62C4-4C98-90A0-9E4D8DF1CA27}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{BB98A559-62C4-4C98-90A0-9E4D8DF1CA27}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{BB98A559-62C4-4C98-90A0-9E4D8DF1CA27}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{BB98A559-62C4-4C98-90A0-9E4D8DF1CA27}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{BB98A559-62C4-4C98-90A0-9E4D8DF1CA27}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{BB98A559-62C4-4C98-90A0-9E4D8DF1CA27}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BB98A559-62C4-4C98-90A0-9E4D8DF1CA27}.Debug|x64.Build.0 = Debug|Any CPU
+		{BB98A559-62C4-4C98-90A0-9E4D8DF1CA27}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BB98A559-62C4-4C98-90A0-9E4D8DF1CA27}.Debug|x86.Build.0 = Debug|Any CPU
+		{BB98A559-62C4-4C98-90A0-9E4D8DF1CA27}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BB98A559-62C4-4C98-90A0-9E4D8DF1CA27}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BB98A559-62C4-4C98-90A0-9E4D8DF1CA27}.Release|ARM.ActiveCfg = Release|Any CPU
+		{BB98A559-62C4-4C98-90A0-9E4D8DF1CA27}.Release|ARM.Build.0 = Release|Any CPU
+		{BB98A559-62C4-4C98-90A0-9E4D8DF1CA27}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{BB98A559-62C4-4C98-90A0-9E4D8DF1CA27}.Release|ARM64.Build.0 = Release|Any CPU
+		{BB98A559-62C4-4C98-90A0-9E4D8DF1CA27}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{BB98A559-62C4-4C98-90A0-9E4D8DF1CA27}.Release|iPhone.Build.0 = Release|Any CPU
+		{BB98A559-62C4-4C98-90A0-9E4D8DF1CA27}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{BB98A559-62C4-4C98-90A0-9E4D8DF1CA27}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{BB98A559-62C4-4C98-90A0-9E4D8DF1CA27}.Release|x64.ActiveCfg = Release|Any CPU
+		{BB98A559-62C4-4C98-90A0-9E4D8DF1CA27}.Release|x64.Build.0 = Release|Any CPU
+		{BB98A559-62C4-4C98-90A0-9E4D8DF1CA27}.Release|x86.ActiveCfg = Release|Any CPU
+		{BB98A559-62C4-4C98-90A0-9E4D8DF1CA27}.Release|x86.Build.0 = Release|Any CPU
+		{C328C538-B69F-43D2-80EE-3C1EB8254CBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C328C538-B69F-43D2-80EE-3C1EB8254CBA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C328C538-B69F-43D2-80EE-3C1EB8254CBA}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{C328C538-B69F-43D2-80EE-3C1EB8254CBA}.Debug|ARM.Build.0 = Debug|Any CPU
+		{C328C538-B69F-43D2-80EE-3C1EB8254CBA}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{C328C538-B69F-43D2-80EE-3C1EB8254CBA}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{C328C538-B69F-43D2-80EE-3C1EB8254CBA}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{C328C538-B69F-43D2-80EE-3C1EB8254CBA}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{C328C538-B69F-43D2-80EE-3C1EB8254CBA}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{C328C538-B69F-43D2-80EE-3C1EB8254CBA}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{C328C538-B69F-43D2-80EE-3C1EB8254CBA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C328C538-B69F-43D2-80EE-3C1EB8254CBA}.Debug|x64.Build.0 = Debug|Any CPU
+		{C328C538-B69F-43D2-80EE-3C1EB8254CBA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C328C538-B69F-43D2-80EE-3C1EB8254CBA}.Debug|x86.Build.0 = Debug|Any CPU
+		{C328C538-B69F-43D2-80EE-3C1EB8254CBA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C328C538-B69F-43D2-80EE-3C1EB8254CBA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C328C538-B69F-43D2-80EE-3C1EB8254CBA}.Release|ARM.ActiveCfg = Release|Any CPU
+		{C328C538-B69F-43D2-80EE-3C1EB8254CBA}.Release|ARM.Build.0 = Release|Any CPU
+		{C328C538-B69F-43D2-80EE-3C1EB8254CBA}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{C328C538-B69F-43D2-80EE-3C1EB8254CBA}.Release|ARM64.Build.0 = Release|Any CPU
+		{C328C538-B69F-43D2-80EE-3C1EB8254CBA}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{C328C538-B69F-43D2-80EE-3C1EB8254CBA}.Release|iPhone.Build.0 = Release|Any CPU
+		{C328C538-B69F-43D2-80EE-3C1EB8254CBA}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{C328C538-B69F-43D2-80EE-3C1EB8254CBA}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{C328C538-B69F-43D2-80EE-3C1EB8254CBA}.Release|x64.ActiveCfg = Release|Any CPU
+		{C328C538-B69F-43D2-80EE-3C1EB8254CBA}.Release|x64.Build.0 = Release|Any CPU
+		{C328C538-B69F-43D2-80EE-3C1EB8254CBA}.Release|x86.ActiveCfg = Release|Any CPU
+		{C328C538-B69F-43D2-80EE-3C1EB8254CBA}.Release|x86.Build.0 = Release|Any CPU
+		{7A753001-1C3D-404D-A421-2E052A545EAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7A753001-1C3D-404D-A421-2E052A545EAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7A753001-1C3D-404D-A421-2E052A545EAC}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{7A753001-1C3D-404D-A421-2E052A545EAC}.Debug|ARM.Build.0 = Debug|Any CPU
+		{7A753001-1C3D-404D-A421-2E052A545EAC}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{7A753001-1C3D-404D-A421-2E052A545EAC}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{7A753001-1C3D-404D-A421-2E052A545EAC}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{7A753001-1C3D-404D-A421-2E052A545EAC}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{7A753001-1C3D-404D-A421-2E052A545EAC}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{7A753001-1C3D-404D-A421-2E052A545EAC}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{7A753001-1C3D-404D-A421-2E052A545EAC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7A753001-1C3D-404D-A421-2E052A545EAC}.Debug|x64.Build.0 = Debug|Any CPU
+		{7A753001-1C3D-404D-A421-2E052A545EAC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7A753001-1C3D-404D-A421-2E052A545EAC}.Debug|x86.Build.0 = Debug|Any CPU
+		{7A753001-1C3D-404D-A421-2E052A545EAC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7A753001-1C3D-404D-A421-2E052A545EAC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7A753001-1C3D-404D-A421-2E052A545EAC}.Release|ARM.ActiveCfg = Release|Any CPU
+		{7A753001-1C3D-404D-A421-2E052A545EAC}.Release|ARM.Build.0 = Release|Any CPU
+		{7A753001-1C3D-404D-A421-2E052A545EAC}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{7A753001-1C3D-404D-A421-2E052A545EAC}.Release|ARM64.Build.0 = Release|Any CPU
+		{7A753001-1C3D-404D-A421-2E052A545EAC}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{7A753001-1C3D-404D-A421-2E052A545EAC}.Release|iPhone.Build.0 = Release|Any CPU
+		{7A753001-1C3D-404D-A421-2E052A545EAC}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{7A753001-1C3D-404D-A421-2E052A545EAC}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{7A753001-1C3D-404D-A421-2E052A545EAC}.Release|x64.ActiveCfg = Release|Any CPU
+		{7A753001-1C3D-404D-A421-2E052A545EAC}.Release|x64.Build.0 = Release|Any CPU
+		{7A753001-1C3D-404D-A421-2E052A545EAC}.Release|x86.ActiveCfg = Release|Any CPU
+		{7A753001-1C3D-404D-A421-2E052A545EAC}.Release|x86.Build.0 = Release|Any CPU
+		{DA9E4D76-8CA4-4CC3-A47C-BA75DFF805C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DA9E4D76-8CA4-4CC3-A47C-BA75DFF805C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DA9E4D76-8CA4-4CC3-A47C-BA75DFF805C6}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{DA9E4D76-8CA4-4CC3-A47C-BA75DFF805C6}.Debug|ARM.Build.0 = Debug|Any CPU
+		{DA9E4D76-8CA4-4CC3-A47C-BA75DFF805C6}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{DA9E4D76-8CA4-4CC3-A47C-BA75DFF805C6}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{DA9E4D76-8CA4-4CC3-A47C-BA75DFF805C6}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{DA9E4D76-8CA4-4CC3-A47C-BA75DFF805C6}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{DA9E4D76-8CA4-4CC3-A47C-BA75DFF805C6}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{DA9E4D76-8CA4-4CC3-A47C-BA75DFF805C6}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{DA9E4D76-8CA4-4CC3-A47C-BA75DFF805C6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DA9E4D76-8CA4-4CC3-A47C-BA75DFF805C6}.Debug|x64.Build.0 = Debug|Any CPU
+		{DA9E4D76-8CA4-4CC3-A47C-BA75DFF805C6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DA9E4D76-8CA4-4CC3-A47C-BA75DFF805C6}.Debug|x86.Build.0 = Debug|Any CPU
+		{DA9E4D76-8CA4-4CC3-A47C-BA75DFF805C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DA9E4D76-8CA4-4CC3-A47C-BA75DFF805C6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DA9E4D76-8CA4-4CC3-A47C-BA75DFF805C6}.Release|ARM.ActiveCfg = Release|Any CPU
+		{DA9E4D76-8CA4-4CC3-A47C-BA75DFF805C6}.Release|ARM.Build.0 = Release|Any CPU
+		{DA9E4D76-8CA4-4CC3-A47C-BA75DFF805C6}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{DA9E4D76-8CA4-4CC3-A47C-BA75DFF805C6}.Release|ARM64.Build.0 = Release|Any CPU
+		{DA9E4D76-8CA4-4CC3-A47C-BA75DFF805C6}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{DA9E4D76-8CA4-4CC3-A47C-BA75DFF805C6}.Release|iPhone.Build.0 = Release|Any CPU
+		{DA9E4D76-8CA4-4CC3-A47C-BA75DFF805C6}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{DA9E4D76-8CA4-4CC3-A47C-BA75DFF805C6}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{DA9E4D76-8CA4-4CC3-A47C-BA75DFF805C6}.Release|x64.ActiveCfg = Release|Any CPU
+		{DA9E4D76-8CA4-4CC3-A47C-BA75DFF805C6}.Release|x64.Build.0 = Release|Any CPU
+		{DA9E4D76-8CA4-4CC3-A47C-BA75DFF805C6}.Release|x86.ActiveCfg = Release|Any CPU
+		{DA9E4D76-8CA4-4CC3-A47C-BA75DFF805C6}.Release|x86.Build.0 = Release|Any CPU
+		{A0B8D99F-4C0E-4D47-8182-9E8879A9B105}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A0B8D99F-4C0E-4D47-8182-9E8879A9B105}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A0B8D99F-4C0E-4D47-8182-9E8879A9B105}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{A0B8D99F-4C0E-4D47-8182-9E8879A9B105}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{A0B8D99F-4C0E-4D47-8182-9E8879A9B105}.Debug|ARM.Build.0 = Debug|Any CPU
+		{A0B8D99F-4C0E-4D47-8182-9E8879A9B105}.Debug|ARM.Deploy.0 = Debug|Any CPU
+		{A0B8D99F-4C0E-4D47-8182-9E8879A9B105}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{A0B8D99F-4C0E-4D47-8182-9E8879A9B105}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{A0B8D99F-4C0E-4D47-8182-9E8879A9B105}.Debug|ARM64.Deploy.0 = Debug|Any CPU
+		{A0B8D99F-4C0E-4D47-8182-9E8879A9B105}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{A0B8D99F-4C0E-4D47-8182-9E8879A9B105}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{A0B8D99F-4C0E-4D47-8182-9E8879A9B105}.Debug|iPhone.Deploy.0 = Debug|Any CPU
+		{A0B8D99F-4C0E-4D47-8182-9E8879A9B105}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{A0B8D99F-4C0E-4D47-8182-9E8879A9B105}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{A0B8D99F-4C0E-4D47-8182-9E8879A9B105}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
+		{A0B8D99F-4C0E-4D47-8182-9E8879A9B105}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A0B8D99F-4C0E-4D47-8182-9E8879A9B105}.Debug|x64.Build.0 = Debug|Any CPU
+		{A0B8D99F-4C0E-4D47-8182-9E8879A9B105}.Debug|x64.Deploy.0 = Debug|Any CPU
+		{A0B8D99F-4C0E-4D47-8182-9E8879A9B105}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A0B8D99F-4C0E-4D47-8182-9E8879A9B105}.Debug|x86.Build.0 = Debug|Any CPU
+		{A0B8D99F-4C0E-4D47-8182-9E8879A9B105}.Debug|x86.Deploy.0 = Debug|Any CPU
+		{A0B8D99F-4C0E-4D47-8182-9E8879A9B105}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A0B8D99F-4C0E-4D47-8182-9E8879A9B105}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A0B8D99F-4C0E-4D47-8182-9E8879A9B105}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{A0B8D99F-4C0E-4D47-8182-9E8879A9B105}.Release|ARM.ActiveCfg = Release|Any CPU
+		{A0B8D99F-4C0E-4D47-8182-9E8879A9B105}.Release|ARM.Build.0 = Release|Any CPU
+		{A0B8D99F-4C0E-4D47-8182-9E8879A9B105}.Release|ARM.Deploy.0 = Release|Any CPU
+		{A0B8D99F-4C0E-4D47-8182-9E8879A9B105}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{A0B8D99F-4C0E-4D47-8182-9E8879A9B105}.Release|ARM64.Build.0 = Release|Any CPU
+		{A0B8D99F-4C0E-4D47-8182-9E8879A9B105}.Release|ARM64.Deploy.0 = Release|Any CPU
+		{A0B8D99F-4C0E-4D47-8182-9E8879A9B105}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{A0B8D99F-4C0E-4D47-8182-9E8879A9B105}.Release|iPhone.Build.0 = Release|Any CPU
+		{A0B8D99F-4C0E-4D47-8182-9E8879A9B105}.Release|iPhone.Deploy.0 = Release|Any CPU
+		{A0B8D99F-4C0E-4D47-8182-9E8879A9B105}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{A0B8D99F-4C0E-4D47-8182-9E8879A9B105}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{A0B8D99F-4C0E-4D47-8182-9E8879A9B105}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
+		{A0B8D99F-4C0E-4D47-8182-9E8879A9B105}.Release|x64.ActiveCfg = Release|Any CPU
+		{A0B8D99F-4C0E-4D47-8182-9E8879A9B105}.Release|x64.Build.0 = Release|Any CPU
+		{A0B8D99F-4C0E-4D47-8182-9E8879A9B105}.Release|x64.Deploy.0 = Release|Any CPU
+		{A0B8D99F-4C0E-4D47-8182-9E8879A9B105}.Release|x86.ActiveCfg = Release|Any CPU
+		{A0B8D99F-4C0E-4D47-8182-9E8879A9B105}.Release|x86.Build.0 = Release|Any CPU
+		{A0B8D99F-4C0E-4D47-8182-9E8879A9B105}.Release|x86.Deploy.0 = Release|Any CPU
+		{EE8FC716-27FC-405B-BD27-AF17E01A6671}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
+		{EE8FC716-27FC-405B-BD27-AF17E01A6671}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
+		{EE8FC716-27FC-405B-BD27-AF17E01A6671}.Debug|Any CPU.Deploy.0 = Debug|iPhoneSimulator
+		{EE8FC716-27FC-405B-BD27-AF17E01A6671}.Debug|ARM.ActiveCfg = Debug|iPhoneSimulator
+		{EE8FC716-27FC-405B-BD27-AF17E01A6671}.Debug|ARM.Build.0 = Debug|iPhoneSimulator
+		{EE8FC716-27FC-405B-BD27-AF17E01A6671}.Debug|ARM64.ActiveCfg = Debug|iPhoneSimulator
+		{EE8FC716-27FC-405B-BD27-AF17E01A6671}.Debug|ARM64.Build.0 = Debug|iPhoneSimulator
+		{EE8FC716-27FC-405B-BD27-AF17E01A6671}.Debug|iPhone.ActiveCfg = Debug|iPhone
+		{EE8FC716-27FC-405B-BD27-AF17E01A6671}.Debug|iPhone.Build.0 = Debug|iPhone
+		{EE8FC716-27FC-405B-BD27-AF17E01A6671}.Debug|iPhone.Deploy.0 = Debug|iPhone
+		{EE8FC716-27FC-405B-BD27-AF17E01A6671}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
+		{EE8FC716-27FC-405B-BD27-AF17E01A6671}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
+		{EE8FC716-27FC-405B-BD27-AF17E01A6671}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator
+		{EE8FC716-27FC-405B-BD27-AF17E01A6671}.Debug|x64.ActiveCfg = Debug|iPhoneSimulator
+		{EE8FC716-27FC-405B-BD27-AF17E01A6671}.Debug|x64.Build.0 = Debug|iPhoneSimulator
+		{EE8FC716-27FC-405B-BD27-AF17E01A6671}.Debug|x64.Deploy.0 = Debug|iPhoneSimulator
+		{EE8FC716-27FC-405B-BD27-AF17E01A6671}.Debug|x86.ActiveCfg = Debug|iPhoneSimulator
+		{EE8FC716-27FC-405B-BD27-AF17E01A6671}.Debug|x86.Build.0 = Debug|iPhoneSimulator
+		{EE8FC716-27FC-405B-BD27-AF17E01A6671}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator
+		{EE8FC716-27FC-405B-BD27-AF17E01A6671}.Release|Any CPU.Build.0 = Release|iPhoneSimulator
+		{EE8FC716-27FC-405B-BD27-AF17E01A6671}.Release|ARM.ActiveCfg = Release|iPhoneSimulator
+		{EE8FC716-27FC-405B-BD27-AF17E01A6671}.Release|ARM.Build.0 = Release|iPhoneSimulator
+		{EE8FC716-27FC-405B-BD27-AF17E01A6671}.Release|ARM64.ActiveCfg = Release|iPhoneSimulator
+		{EE8FC716-27FC-405B-BD27-AF17E01A6671}.Release|ARM64.Build.0 = Release|iPhoneSimulator
+		{EE8FC716-27FC-405B-BD27-AF17E01A6671}.Release|iPhone.ActiveCfg = Release|iPhone
+		{EE8FC716-27FC-405B-BD27-AF17E01A6671}.Release|iPhone.Build.0 = Release|iPhone
+		{EE8FC716-27FC-405B-BD27-AF17E01A6671}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
+		{EE8FC716-27FC-405B-BD27-AF17E01A6671}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
+		{EE8FC716-27FC-405B-BD27-AF17E01A6671}.Release|x64.ActiveCfg = Release|iPhoneSimulator
+		{EE8FC716-27FC-405B-BD27-AF17E01A6671}.Release|x64.Build.0 = Release|iPhoneSimulator
+		{EE8FC716-27FC-405B-BD27-AF17E01A6671}.Release|x86.ActiveCfg = Release|iPhoneSimulator
+		{EE8FC716-27FC-405B-BD27-AF17E01A6671}.Release|x86.Build.0 = Release|iPhoneSimulator
+		{8CB95D25-8442-42BC-82BE-319D21138549}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8CB95D25-8442-42BC-82BE-319D21138549}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8CB95D25-8442-42BC-82BE-319D21138549}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{8CB95D25-8442-42BC-82BE-319D21138549}.Debug|ARM.Build.0 = Debug|Any CPU
+		{8CB95D25-8442-42BC-82BE-319D21138549}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{8CB95D25-8442-42BC-82BE-319D21138549}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{8CB95D25-8442-42BC-82BE-319D21138549}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{8CB95D25-8442-42BC-82BE-319D21138549}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{8CB95D25-8442-42BC-82BE-319D21138549}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{8CB95D25-8442-42BC-82BE-319D21138549}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{8CB95D25-8442-42BC-82BE-319D21138549}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8CB95D25-8442-42BC-82BE-319D21138549}.Debug|x64.Build.0 = Debug|Any CPU
+		{8CB95D25-8442-42BC-82BE-319D21138549}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8CB95D25-8442-42BC-82BE-319D21138549}.Debug|x86.Build.0 = Debug|Any CPU
+		{8CB95D25-8442-42BC-82BE-319D21138549}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8CB95D25-8442-42BC-82BE-319D21138549}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8CB95D25-8442-42BC-82BE-319D21138549}.Release|ARM.ActiveCfg = Release|Any CPU
+		{8CB95D25-8442-42BC-82BE-319D21138549}.Release|ARM.Build.0 = Release|Any CPU
+		{8CB95D25-8442-42BC-82BE-319D21138549}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{8CB95D25-8442-42BC-82BE-319D21138549}.Release|ARM64.Build.0 = Release|Any CPU
+		{8CB95D25-8442-42BC-82BE-319D21138549}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{8CB95D25-8442-42BC-82BE-319D21138549}.Release|iPhone.Build.0 = Release|Any CPU
+		{8CB95D25-8442-42BC-82BE-319D21138549}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{8CB95D25-8442-42BC-82BE-319D21138549}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{8CB95D25-8442-42BC-82BE-319D21138549}.Release|x64.ActiveCfg = Release|Any CPU
+		{8CB95D25-8442-42BC-82BE-319D21138549}.Release|x64.Build.0 = Release|Any CPU
+		{8CB95D25-8442-42BC-82BE-319D21138549}.Release|x86.ActiveCfg = Release|Any CPU
+		{8CB95D25-8442-42BC-82BE-319D21138549}.Release|x86.Build.0 = Release|Any CPU
+		{2E0EB4A3-3C4A-4A5E-8D2F-F77C62464886}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2E0EB4A3-3C4A-4A5E-8D2F-F77C62464886}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2E0EB4A3-3C4A-4A5E-8D2F-F77C62464886}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{2E0EB4A3-3C4A-4A5E-8D2F-F77C62464886}.Debug|ARM.Build.0 = Debug|Any CPU
+		{2E0EB4A3-3C4A-4A5E-8D2F-F77C62464886}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{2E0EB4A3-3C4A-4A5E-8D2F-F77C62464886}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{2E0EB4A3-3C4A-4A5E-8D2F-F77C62464886}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{2E0EB4A3-3C4A-4A5E-8D2F-F77C62464886}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{2E0EB4A3-3C4A-4A5E-8D2F-F77C62464886}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{2E0EB4A3-3C4A-4A5E-8D2F-F77C62464886}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{2E0EB4A3-3C4A-4A5E-8D2F-F77C62464886}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2E0EB4A3-3C4A-4A5E-8D2F-F77C62464886}.Debug|x64.Build.0 = Debug|Any CPU
+		{2E0EB4A3-3C4A-4A5E-8D2F-F77C62464886}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2E0EB4A3-3C4A-4A5E-8D2F-F77C62464886}.Debug|x86.Build.0 = Debug|Any CPU
+		{2E0EB4A3-3C4A-4A5E-8D2F-F77C62464886}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2E0EB4A3-3C4A-4A5E-8D2F-F77C62464886}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2E0EB4A3-3C4A-4A5E-8D2F-F77C62464886}.Release|ARM.ActiveCfg = Release|Any CPU
+		{2E0EB4A3-3C4A-4A5E-8D2F-F77C62464886}.Release|ARM.Build.0 = Release|Any CPU
+		{2E0EB4A3-3C4A-4A5E-8D2F-F77C62464886}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{2E0EB4A3-3C4A-4A5E-8D2F-F77C62464886}.Release|ARM64.Build.0 = Release|Any CPU
+		{2E0EB4A3-3C4A-4A5E-8D2F-F77C62464886}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{2E0EB4A3-3C4A-4A5E-8D2F-F77C62464886}.Release|iPhone.Build.0 = Release|Any CPU
+		{2E0EB4A3-3C4A-4A5E-8D2F-F77C62464886}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{2E0EB4A3-3C4A-4A5E-8D2F-F77C62464886}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{2E0EB4A3-3C4A-4A5E-8D2F-F77C62464886}.Release|x64.ActiveCfg = Release|Any CPU
+		{2E0EB4A3-3C4A-4A5E-8D2F-F77C62464886}.Release|x64.Build.0 = Release|Any CPU
+		{2E0EB4A3-3C4A-4A5E-8D2F-F77C62464886}.Release|x86.ActiveCfg = Release|Any CPU
+		{2E0EB4A3-3C4A-4A5E-8D2F-F77C62464886}.Release|x86.Build.0 = Release|Any CPU
+		{B73EB308-70BE-49FD-91A7-1D1495663D6D}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
+		{B73EB308-70BE-49FD-91A7-1D1495663D6D}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
+		{B73EB308-70BE-49FD-91A7-1D1495663D6D}.Debug|ARM.ActiveCfg = Debug|iPhoneSimulator
+		{B73EB308-70BE-49FD-91A7-1D1495663D6D}.Debug|ARM64.ActiveCfg = Debug|iPhoneSimulator
+		{B73EB308-70BE-49FD-91A7-1D1495663D6D}.Debug|iPhone.ActiveCfg = Debug|iPhone
+		{B73EB308-70BE-49FD-91A7-1D1495663D6D}.Debug|iPhone.Build.0 = Debug|iPhone
+		{B73EB308-70BE-49FD-91A7-1D1495663D6D}.Debug|iPhone.Deploy.0 = Debug|iPhone
+		{B73EB308-70BE-49FD-91A7-1D1495663D6D}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
+		{B73EB308-70BE-49FD-91A7-1D1495663D6D}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
+		{B73EB308-70BE-49FD-91A7-1D1495663D6D}.Debug|x64.ActiveCfg = Debug|iPhoneSimulator
+		{B73EB308-70BE-49FD-91A7-1D1495663D6D}.Debug|x64.Build.0 = Debug|iPhoneSimulator
+		{B73EB308-70BE-49FD-91A7-1D1495663D6D}.Debug|x64.Deploy.0 = Debug|iPhoneSimulator
+		{B73EB308-70BE-49FD-91A7-1D1495663D6D}.Debug|x86.ActiveCfg = Debug|iPhoneSimulator
+		{B73EB308-70BE-49FD-91A7-1D1495663D6D}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator
+		{B73EB308-70BE-49FD-91A7-1D1495663D6D}.Release|ARM.ActiveCfg = Release|iPhoneSimulator
+		{B73EB308-70BE-49FD-91A7-1D1495663D6D}.Release|ARM64.ActiveCfg = Release|iPhoneSimulator
+		{B73EB308-70BE-49FD-91A7-1D1495663D6D}.Release|iPhone.ActiveCfg = Release|iPhone
+		{B73EB308-70BE-49FD-91A7-1D1495663D6D}.Release|iPhone.Build.0 = Release|iPhone
+		{B73EB308-70BE-49FD-91A7-1D1495663D6D}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
+		{B73EB308-70BE-49FD-91A7-1D1495663D6D}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
+		{B73EB308-70BE-49FD-91A7-1D1495663D6D}.Release|x64.ActiveCfg = Release|iPhoneSimulator
+		{B73EB308-70BE-49FD-91A7-1D1495663D6D}.Release|x86.ActiveCfg = Release|iPhoneSimulator
+		{81128D28-CFC8-4EA4-B68D-9939339C461A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{81128D28-CFC8-4EA4-B68D-9939339C461A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{81128D28-CFC8-4EA4-B68D-9939339C461A}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{81128D28-CFC8-4EA4-B68D-9939339C461A}.Debug|ARM.Build.0 = Debug|Any CPU
+		{81128D28-CFC8-4EA4-B68D-9939339C461A}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{81128D28-CFC8-4EA4-B68D-9939339C461A}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{81128D28-CFC8-4EA4-B68D-9939339C461A}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{81128D28-CFC8-4EA4-B68D-9939339C461A}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{81128D28-CFC8-4EA4-B68D-9939339C461A}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{81128D28-CFC8-4EA4-B68D-9939339C461A}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{81128D28-CFC8-4EA4-B68D-9939339C461A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{81128D28-CFC8-4EA4-B68D-9939339C461A}.Debug|x64.Build.0 = Debug|Any CPU
+		{81128D28-CFC8-4EA4-B68D-9939339C461A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{81128D28-CFC8-4EA4-B68D-9939339C461A}.Debug|x86.Build.0 = Debug|Any CPU
+		{81128D28-CFC8-4EA4-B68D-9939339C461A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{81128D28-CFC8-4EA4-B68D-9939339C461A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{81128D28-CFC8-4EA4-B68D-9939339C461A}.Release|ARM.ActiveCfg = Release|Any CPU
+		{81128D28-CFC8-4EA4-B68D-9939339C461A}.Release|ARM.Build.0 = Release|Any CPU
+		{81128D28-CFC8-4EA4-B68D-9939339C461A}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{81128D28-CFC8-4EA4-B68D-9939339C461A}.Release|ARM64.Build.0 = Release|Any CPU
+		{81128D28-CFC8-4EA4-B68D-9939339C461A}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{81128D28-CFC8-4EA4-B68D-9939339C461A}.Release|iPhone.Build.0 = Release|Any CPU
+		{81128D28-CFC8-4EA4-B68D-9939339C461A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{81128D28-CFC8-4EA4-B68D-9939339C461A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{81128D28-CFC8-4EA4-B68D-9939339C461A}.Release|x64.ActiveCfg = Release|Any CPU
+		{81128D28-CFC8-4EA4-B68D-9939339C461A}.Release|x64.Build.0 = Release|Any CPU
+		{81128D28-CFC8-4EA4-B68D-9939339C461A}.Release|x86.ActiveCfg = Release|Any CPU
+		{81128D28-CFC8-4EA4-B68D-9939339C461A}.Release|x86.Build.0 = Release|Any CPU
+		{AB6242B7-634F-4839-A991-7629D0D2C636}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
+		{AB6242B7-634F-4839-A991-7629D0D2C636}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
+		{AB6242B7-634F-4839-A991-7629D0D2C636}.Debug|ARM.ActiveCfg = Debug|iPhoneSimulator
+		{AB6242B7-634F-4839-A991-7629D0D2C636}.Debug|ARM64.ActiveCfg = Debug|iPhoneSimulator
+		{AB6242B7-634F-4839-A991-7629D0D2C636}.Debug|iPhone.ActiveCfg = Debug|iPhone
+		{AB6242B7-634F-4839-A991-7629D0D2C636}.Debug|iPhone.Build.0 = Debug|iPhone
+		{AB6242B7-634F-4839-A991-7629D0D2C636}.Debug|iPhone.Deploy.0 = Debug|iPhone
+		{AB6242B7-634F-4839-A991-7629D0D2C636}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
+		{AB6242B7-634F-4839-A991-7629D0D2C636}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
+		{AB6242B7-634F-4839-A991-7629D0D2C636}.Debug|x64.ActiveCfg = Debug|iPhoneSimulator
+		{AB6242B7-634F-4839-A991-7629D0D2C636}.Debug|x64.Build.0 = Debug|iPhoneSimulator
+		{AB6242B7-634F-4839-A991-7629D0D2C636}.Debug|x64.Deploy.0 = Debug|iPhoneSimulator
+		{AB6242B7-634F-4839-A991-7629D0D2C636}.Debug|x86.ActiveCfg = Debug|iPhoneSimulator
+		{AB6242B7-634F-4839-A991-7629D0D2C636}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator
+		{AB6242B7-634F-4839-A991-7629D0D2C636}.Release|ARM.ActiveCfg = Release|iPhoneSimulator
+		{AB6242B7-634F-4839-A991-7629D0D2C636}.Release|ARM64.ActiveCfg = Release|iPhoneSimulator
+		{AB6242B7-634F-4839-A991-7629D0D2C636}.Release|iPhone.ActiveCfg = Release|iPhone
+		{AB6242B7-634F-4839-A991-7629D0D2C636}.Release|iPhone.Build.0 = Release|iPhone
+		{AB6242B7-634F-4839-A991-7629D0D2C636}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
+		{AB6242B7-634F-4839-A991-7629D0D2C636}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
+		{AB6242B7-634F-4839-A991-7629D0D2C636}.Release|x64.ActiveCfg = Release|iPhoneSimulator
+		{AB6242B7-634F-4839-A991-7629D0D2C636}.Release|x86.ActiveCfg = Release|iPhoneSimulator
+		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Debug|ARM.Build.0 = Debug|Any CPU
+		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Debug|x64.Build.0 = Debug|Any CPU
+		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Debug|x86.Build.0 = Debug|Any CPU
+		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Release|ARM.ActiveCfg = Release|Any CPU
+		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Release|ARM.Build.0 = Release|Any CPU
+		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Release|ARM64.Build.0 = Release|Any CPU
+		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Release|iPhone.Build.0 = Release|Any CPU
+		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Release|x64.ActiveCfg = Release|Any CPU
+		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Release|x64.Build.0 = Release|Any CPU
+		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Release|x86.ActiveCfg = Release|Any CPU
+		{2C69EB76-02C4-4921-96A1-4D70CB7CE744}.Release|x86.Build.0 = Release|Any CPU
+		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Debug|ARM.Build.0 = Debug|Any CPU
+		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Debug|x64.Build.0 = Debug|Any CPU
+		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Debug|x86.Build.0 = Debug|Any CPU
+		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Release|ARM.ActiveCfg = Release|Any CPU
+		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Release|ARM.Build.0 = Release|Any CPU
+		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Release|ARM64.Build.0 = Release|Any CPU
+		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Release|iPhone.Build.0 = Release|Any CPU
+		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Release|x64.ActiveCfg = Release|Any CPU
+		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Release|x64.Build.0 = Release|Any CPU
+		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Release|x86.ActiveCfg = Release|Any CPU
+		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C}.Release|x86.Build.0 = Release|Any CPU
+		{73100F0D-C0BB-4F16-8FC2-FA3FA8ACD424}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{73100F0D-C0BB-4F16-8FC2-FA3FA8ACD424}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{73100F0D-C0BB-4F16-8FC2-FA3FA8ACD424}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{73100F0D-C0BB-4F16-8FC2-FA3FA8ACD424}.Debug|ARM.Build.0 = Debug|Any CPU
+		{73100F0D-C0BB-4F16-8FC2-FA3FA8ACD424}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{73100F0D-C0BB-4F16-8FC2-FA3FA8ACD424}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{73100F0D-C0BB-4F16-8FC2-FA3FA8ACD424}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{73100F0D-C0BB-4F16-8FC2-FA3FA8ACD424}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{73100F0D-C0BB-4F16-8FC2-FA3FA8ACD424}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{73100F0D-C0BB-4F16-8FC2-FA3FA8ACD424}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{73100F0D-C0BB-4F16-8FC2-FA3FA8ACD424}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{73100F0D-C0BB-4F16-8FC2-FA3FA8ACD424}.Debug|x64.Build.0 = Debug|Any CPU
+		{73100F0D-C0BB-4F16-8FC2-FA3FA8ACD424}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{73100F0D-C0BB-4F16-8FC2-FA3FA8ACD424}.Debug|x86.Build.0 = Debug|Any CPU
+		{73100F0D-C0BB-4F16-8FC2-FA3FA8ACD424}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{73100F0D-C0BB-4F16-8FC2-FA3FA8ACD424}.Release|Any CPU.Build.0 = Release|Any CPU
+		{73100F0D-C0BB-4F16-8FC2-FA3FA8ACD424}.Release|ARM.ActiveCfg = Release|Any CPU
+		{73100F0D-C0BB-4F16-8FC2-FA3FA8ACD424}.Release|ARM.Build.0 = Release|Any CPU
+		{73100F0D-C0BB-4F16-8FC2-FA3FA8ACD424}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{73100F0D-C0BB-4F16-8FC2-FA3FA8ACD424}.Release|ARM64.Build.0 = Release|Any CPU
+		{73100F0D-C0BB-4F16-8FC2-FA3FA8ACD424}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{73100F0D-C0BB-4F16-8FC2-FA3FA8ACD424}.Release|iPhone.Build.0 = Release|Any CPU
+		{73100F0D-C0BB-4F16-8FC2-FA3FA8ACD424}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{73100F0D-C0BB-4F16-8FC2-FA3FA8ACD424}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{73100F0D-C0BB-4F16-8FC2-FA3FA8ACD424}.Release|x64.ActiveCfg = Release|Any CPU
+		{73100F0D-C0BB-4F16-8FC2-FA3FA8ACD424}.Release|x64.Build.0 = Release|Any CPU
+		{73100F0D-C0BB-4F16-8FC2-FA3FA8ACD424}.Release|x86.ActiveCfg = Release|Any CPU
+		{73100F0D-C0BB-4F16-8FC2-FA3FA8ACD424}.Release|x86.Build.0 = Release|Any CPU
+		{90B727DD-4C7B-4462-950F-61842A87DE8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{90B727DD-4C7B-4462-950F-61842A87DE8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{90B727DD-4C7B-4462-950F-61842A87DE8A}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{90B727DD-4C7B-4462-950F-61842A87DE8A}.Debug|ARM.Build.0 = Debug|Any CPU
+		{90B727DD-4C7B-4462-950F-61842A87DE8A}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{90B727DD-4C7B-4462-950F-61842A87DE8A}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{90B727DD-4C7B-4462-950F-61842A87DE8A}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{90B727DD-4C7B-4462-950F-61842A87DE8A}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{90B727DD-4C7B-4462-950F-61842A87DE8A}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{90B727DD-4C7B-4462-950F-61842A87DE8A}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{90B727DD-4C7B-4462-950F-61842A87DE8A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{90B727DD-4C7B-4462-950F-61842A87DE8A}.Debug|x64.Build.0 = Debug|Any CPU
+		{90B727DD-4C7B-4462-950F-61842A87DE8A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{90B727DD-4C7B-4462-950F-61842A87DE8A}.Debug|x86.Build.0 = Debug|Any CPU
+		{90B727DD-4C7B-4462-950F-61842A87DE8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{90B727DD-4C7B-4462-950F-61842A87DE8A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{90B727DD-4C7B-4462-950F-61842A87DE8A}.Release|ARM.ActiveCfg = Release|Any CPU
+		{90B727DD-4C7B-4462-950F-61842A87DE8A}.Release|ARM.Build.0 = Release|Any CPU
+		{90B727DD-4C7B-4462-950F-61842A87DE8A}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{90B727DD-4C7B-4462-950F-61842A87DE8A}.Release|ARM64.Build.0 = Release|Any CPU
+		{90B727DD-4C7B-4462-950F-61842A87DE8A}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{90B727DD-4C7B-4462-950F-61842A87DE8A}.Release|iPhone.Build.0 = Release|Any CPU
+		{90B727DD-4C7B-4462-950F-61842A87DE8A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{90B727DD-4C7B-4462-950F-61842A87DE8A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{90B727DD-4C7B-4462-950F-61842A87DE8A}.Release|x64.ActiveCfg = Release|Any CPU
+		{90B727DD-4C7B-4462-950F-61842A87DE8A}.Release|x64.Build.0 = Release|Any CPU
+		{90B727DD-4C7B-4462-950F-61842A87DE8A}.Release|x86.ActiveCfg = Release|Any CPU
+		{90B727DD-4C7B-4462-950F-61842A87DE8A}.Release|x86.Build.0 = Release|Any CPU
+		{D51AD52D-C4C6-445A-BD0F-884BE5C1C526}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
+		{D51AD52D-C4C6-445A-BD0F-884BE5C1C526}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
+		{D51AD52D-C4C6-445A-BD0F-884BE5C1C526}.Debug|ARM.ActiveCfg = Debug|iPhoneSimulator
+		{D51AD52D-C4C6-445A-BD0F-884BE5C1C526}.Debug|ARM64.ActiveCfg = Debug|iPhoneSimulator
+		{D51AD52D-C4C6-445A-BD0F-884BE5C1C526}.Debug|iPhone.ActiveCfg = Debug|iPhone
+		{D51AD52D-C4C6-445A-BD0F-884BE5C1C526}.Debug|iPhone.Build.0 = Debug|iPhone
+		{D51AD52D-C4C6-445A-BD0F-884BE5C1C526}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
+		{D51AD52D-C4C6-445A-BD0F-884BE5C1C526}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
+		{D51AD52D-C4C6-445A-BD0F-884BE5C1C526}.Debug|x64.ActiveCfg = Debug|iPhoneSimulator
+		{D51AD52D-C4C6-445A-BD0F-884BE5C1C526}.Debug|x86.ActiveCfg = Debug|iPhoneSimulator
+		{D51AD52D-C4C6-445A-BD0F-884BE5C1C526}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator
+		{D51AD52D-C4C6-445A-BD0F-884BE5C1C526}.Release|ARM.ActiveCfg = Release|iPhoneSimulator
+		{D51AD52D-C4C6-445A-BD0F-884BE5C1C526}.Release|ARM64.ActiveCfg = Release|iPhoneSimulator
+		{D51AD52D-C4C6-445A-BD0F-884BE5C1C526}.Release|iPhone.ActiveCfg = Release|iPhone
+		{D51AD52D-C4C6-445A-BD0F-884BE5C1C526}.Release|iPhone.Build.0 = Release|iPhone
+		{D51AD52D-C4C6-445A-BD0F-884BE5C1C526}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
+		{D51AD52D-C4C6-445A-BD0F-884BE5C1C526}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
+		{D51AD52D-C4C6-445A-BD0F-884BE5C1C526}.Release|x64.ActiveCfg = Release|iPhoneSimulator
+		{D51AD52D-C4C6-445A-BD0F-884BE5C1C526}.Release|x86.ActiveCfg = Release|iPhoneSimulator
+		{F2379E0F-524F-47BC-877C-0428E4C836D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F2379E0F-524F-47BC-877C-0428E4C836D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F2379E0F-524F-47BC-877C-0428E4C836D4}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{F2379E0F-524F-47BC-877C-0428E4C836D4}.Debug|ARM.Build.0 = Debug|Any CPU
+		{F2379E0F-524F-47BC-877C-0428E4C836D4}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{F2379E0F-524F-47BC-877C-0428E4C836D4}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{F2379E0F-524F-47BC-877C-0428E4C836D4}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{F2379E0F-524F-47BC-877C-0428E4C836D4}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{F2379E0F-524F-47BC-877C-0428E4C836D4}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{F2379E0F-524F-47BC-877C-0428E4C836D4}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{F2379E0F-524F-47BC-877C-0428E4C836D4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F2379E0F-524F-47BC-877C-0428E4C836D4}.Debug|x64.Build.0 = Debug|Any CPU
+		{F2379E0F-524F-47BC-877C-0428E4C836D4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F2379E0F-524F-47BC-877C-0428E4C836D4}.Debug|x86.Build.0 = Debug|Any CPU
+		{F2379E0F-524F-47BC-877C-0428E4C836D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F2379E0F-524F-47BC-877C-0428E4C836D4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F2379E0F-524F-47BC-877C-0428E4C836D4}.Release|ARM.ActiveCfg = Release|Any CPU
+		{F2379E0F-524F-47BC-877C-0428E4C836D4}.Release|ARM.Build.0 = Release|Any CPU
+		{F2379E0F-524F-47BC-877C-0428E4C836D4}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{F2379E0F-524F-47BC-877C-0428E4C836D4}.Release|ARM64.Build.0 = Release|Any CPU
+		{F2379E0F-524F-47BC-877C-0428E4C836D4}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{F2379E0F-524F-47BC-877C-0428E4C836D4}.Release|iPhone.Build.0 = Release|Any CPU
+		{F2379E0F-524F-47BC-877C-0428E4C836D4}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{F2379E0F-524F-47BC-877C-0428E4C836D4}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{F2379E0F-524F-47BC-877C-0428E4C836D4}.Release|x64.ActiveCfg = Release|Any CPU
+		{F2379E0F-524F-47BC-877C-0428E4C836D4}.Release|x64.Build.0 = Release|Any CPU
+		{F2379E0F-524F-47BC-877C-0428E4C836D4}.Release|x86.ActiveCfg = Release|Any CPU
+		{F2379E0F-524F-47BC-877C-0428E4C836D4}.Release|x86.Build.0 = Release|Any CPU
+		{F905B72C-4DF7-408B-8B2B-50F9B8246A5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F905B72C-4DF7-408B-8B2B-50F9B8246A5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F905B72C-4DF7-408B-8B2B-50F9B8246A5E}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{F905B72C-4DF7-408B-8B2B-50F9B8246A5E}.Debug|ARM.Build.0 = Debug|Any CPU
+		{F905B72C-4DF7-408B-8B2B-50F9B8246A5E}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{F905B72C-4DF7-408B-8B2B-50F9B8246A5E}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{F905B72C-4DF7-408B-8B2B-50F9B8246A5E}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{F905B72C-4DF7-408B-8B2B-50F9B8246A5E}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{F905B72C-4DF7-408B-8B2B-50F9B8246A5E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{F905B72C-4DF7-408B-8B2B-50F9B8246A5E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{F905B72C-4DF7-408B-8B2B-50F9B8246A5E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F905B72C-4DF7-408B-8B2B-50F9B8246A5E}.Debug|x64.Build.0 = Debug|Any CPU
+		{F905B72C-4DF7-408B-8B2B-50F9B8246A5E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F905B72C-4DF7-408B-8B2B-50F9B8246A5E}.Debug|x86.Build.0 = Debug|Any CPU
+		{F905B72C-4DF7-408B-8B2B-50F9B8246A5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F905B72C-4DF7-408B-8B2B-50F9B8246A5E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F905B72C-4DF7-408B-8B2B-50F9B8246A5E}.Release|ARM.ActiveCfg = Release|Any CPU
+		{F905B72C-4DF7-408B-8B2B-50F9B8246A5E}.Release|ARM.Build.0 = Release|Any CPU
+		{F905B72C-4DF7-408B-8B2B-50F9B8246A5E}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{F905B72C-4DF7-408B-8B2B-50F9B8246A5E}.Release|ARM64.Build.0 = Release|Any CPU
+		{F905B72C-4DF7-408B-8B2B-50F9B8246A5E}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{F905B72C-4DF7-408B-8B2B-50F9B8246A5E}.Release|iPhone.Build.0 = Release|Any CPU
+		{F905B72C-4DF7-408B-8B2B-50F9B8246A5E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{F905B72C-4DF7-408B-8B2B-50F9B8246A5E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{F905B72C-4DF7-408B-8B2B-50F9B8246A5E}.Release|x64.ActiveCfg = Release|Any CPU
+		{F905B72C-4DF7-408B-8B2B-50F9B8246A5E}.Release|x64.Build.0 = Release|Any CPU
+		{F905B72C-4DF7-408B-8B2B-50F9B8246A5E}.Release|x86.ActiveCfg = Release|Any CPU
+		{F905B72C-4DF7-408B-8B2B-50F9B8246A5E}.Release|x86.Build.0 = Release|Any CPU
+		{E4CB9988-7348-4D55-A08E-85907732F8DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E4CB9988-7348-4D55-A08E-85907732F8DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E4CB9988-7348-4D55-A08E-85907732F8DA}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{E4CB9988-7348-4D55-A08E-85907732F8DA}.Debug|ARM.Build.0 = Debug|Any CPU
+		{E4CB9988-7348-4D55-A08E-85907732F8DA}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{E4CB9988-7348-4D55-A08E-85907732F8DA}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{E4CB9988-7348-4D55-A08E-85907732F8DA}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{E4CB9988-7348-4D55-A08E-85907732F8DA}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{E4CB9988-7348-4D55-A08E-85907732F8DA}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{E4CB9988-7348-4D55-A08E-85907732F8DA}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{E4CB9988-7348-4D55-A08E-85907732F8DA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E4CB9988-7348-4D55-A08E-85907732F8DA}.Debug|x64.Build.0 = Debug|Any CPU
+		{E4CB9988-7348-4D55-A08E-85907732F8DA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E4CB9988-7348-4D55-A08E-85907732F8DA}.Debug|x86.Build.0 = Debug|Any CPU
+		{E4CB9988-7348-4D55-A08E-85907732F8DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E4CB9988-7348-4D55-A08E-85907732F8DA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E4CB9988-7348-4D55-A08E-85907732F8DA}.Release|ARM.ActiveCfg = Release|Any CPU
+		{E4CB9988-7348-4D55-A08E-85907732F8DA}.Release|ARM.Build.0 = Release|Any CPU
+		{E4CB9988-7348-4D55-A08E-85907732F8DA}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{E4CB9988-7348-4D55-A08E-85907732F8DA}.Release|ARM64.Build.0 = Release|Any CPU
+		{E4CB9988-7348-4D55-A08E-85907732F8DA}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{E4CB9988-7348-4D55-A08E-85907732F8DA}.Release|iPhone.Build.0 = Release|Any CPU
+		{E4CB9988-7348-4D55-A08E-85907732F8DA}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{E4CB9988-7348-4D55-A08E-85907732F8DA}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{E4CB9988-7348-4D55-A08E-85907732F8DA}.Release|x64.ActiveCfg = Release|Any CPU
+		{E4CB9988-7348-4D55-A08E-85907732F8DA}.Release|x64.Build.0 = Release|Any CPU
+		{E4CB9988-7348-4D55-A08E-85907732F8DA}.Release|x86.ActiveCfg = Release|Any CPU
+		{E4CB9988-7348-4D55-A08E-85907732F8DA}.Release|x86.Build.0 = Release|Any CPU
+		{551B2209-4298-4D60-B55C-79077B8BC244}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{551B2209-4298-4D60-B55C-79077B8BC244}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{551B2209-4298-4D60-B55C-79077B8BC244}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{551B2209-4298-4D60-B55C-79077B8BC244}.Debug|ARM.Build.0 = Debug|Any CPU
+		{551B2209-4298-4D60-B55C-79077B8BC244}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{551B2209-4298-4D60-B55C-79077B8BC244}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{551B2209-4298-4D60-B55C-79077B8BC244}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{551B2209-4298-4D60-B55C-79077B8BC244}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{551B2209-4298-4D60-B55C-79077B8BC244}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{551B2209-4298-4D60-B55C-79077B8BC244}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{551B2209-4298-4D60-B55C-79077B8BC244}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{551B2209-4298-4D60-B55C-79077B8BC244}.Debug|x64.Build.0 = Debug|Any CPU
+		{551B2209-4298-4D60-B55C-79077B8BC244}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{551B2209-4298-4D60-B55C-79077B8BC244}.Debug|x86.Build.0 = Debug|Any CPU
+		{551B2209-4298-4D60-B55C-79077B8BC244}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{551B2209-4298-4D60-B55C-79077B8BC244}.Release|Any CPU.Build.0 = Release|Any CPU
+		{551B2209-4298-4D60-B55C-79077B8BC244}.Release|ARM.ActiveCfg = Release|Any CPU
+		{551B2209-4298-4D60-B55C-79077B8BC244}.Release|ARM.Build.0 = Release|Any CPU
+		{551B2209-4298-4D60-B55C-79077B8BC244}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{551B2209-4298-4D60-B55C-79077B8BC244}.Release|ARM64.Build.0 = Release|Any CPU
+		{551B2209-4298-4D60-B55C-79077B8BC244}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{551B2209-4298-4D60-B55C-79077B8BC244}.Release|iPhone.Build.0 = Release|Any CPU
+		{551B2209-4298-4D60-B55C-79077B8BC244}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{551B2209-4298-4D60-B55C-79077B8BC244}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{551B2209-4298-4D60-B55C-79077B8BC244}.Release|x64.ActiveCfg = Release|Any CPU
+		{551B2209-4298-4D60-B55C-79077B8BC244}.Release|x64.Build.0 = Release|Any CPU
+		{551B2209-4298-4D60-B55C-79077B8BC244}.Release|x86.ActiveCfg = Release|Any CPU
+		{551B2209-4298-4D60-B55C-79077B8BC244}.Release|x86.Build.0 = Release|Any CPU
+		{3E1D0DED-6B13-42C8-AA15-2EDFD8ECE80C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3E1D0DED-6B13-42C8-AA15-2EDFD8ECE80C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3E1D0DED-6B13-42C8-AA15-2EDFD8ECE80C}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{3E1D0DED-6B13-42C8-AA15-2EDFD8ECE80C}.Debug|ARM.Build.0 = Debug|Any CPU
+		{3E1D0DED-6B13-42C8-AA15-2EDFD8ECE80C}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{3E1D0DED-6B13-42C8-AA15-2EDFD8ECE80C}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{3E1D0DED-6B13-42C8-AA15-2EDFD8ECE80C}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{3E1D0DED-6B13-42C8-AA15-2EDFD8ECE80C}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{3E1D0DED-6B13-42C8-AA15-2EDFD8ECE80C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{3E1D0DED-6B13-42C8-AA15-2EDFD8ECE80C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{3E1D0DED-6B13-42C8-AA15-2EDFD8ECE80C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3E1D0DED-6B13-42C8-AA15-2EDFD8ECE80C}.Debug|x64.Build.0 = Debug|Any CPU
+		{3E1D0DED-6B13-42C8-AA15-2EDFD8ECE80C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3E1D0DED-6B13-42C8-AA15-2EDFD8ECE80C}.Debug|x86.Build.0 = Debug|Any CPU
+		{3E1D0DED-6B13-42C8-AA15-2EDFD8ECE80C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3E1D0DED-6B13-42C8-AA15-2EDFD8ECE80C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3E1D0DED-6B13-42C8-AA15-2EDFD8ECE80C}.Release|ARM.ActiveCfg = Release|Any CPU
+		{3E1D0DED-6B13-42C8-AA15-2EDFD8ECE80C}.Release|ARM.Build.0 = Release|Any CPU
+		{3E1D0DED-6B13-42C8-AA15-2EDFD8ECE80C}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{3E1D0DED-6B13-42C8-AA15-2EDFD8ECE80C}.Release|ARM64.Build.0 = Release|Any CPU
+		{3E1D0DED-6B13-42C8-AA15-2EDFD8ECE80C}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{3E1D0DED-6B13-42C8-AA15-2EDFD8ECE80C}.Release|iPhone.Build.0 = Release|Any CPU
+		{3E1D0DED-6B13-42C8-AA15-2EDFD8ECE80C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{3E1D0DED-6B13-42C8-AA15-2EDFD8ECE80C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{3E1D0DED-6B13-42C8-AA15-2EDFD8ECE80C}.Release|x64.ActiveCfg = Release|Any CPU
+		{3E1D0DED-6B13-42C8-AA15-2EDFD8ECE80C}.Release|x64.Build.0 = Release|Any CPU
+		{3E1D0DED-6B13-42C8-AA15-2EDFD8ECE80C}.Release|x86.ActiveCfg = Release|Any CPU
+		{3E1D0DED-6B13-42C8-AA15-2EDFD8ECE80C}.Release|x86.Build.0 = Release|Any CPU
+		{BDFA84D6-6C6B-44C9-ABC5-563CFD0C4DB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BDFA84D6-6C6B-44C9-ABC5-563CFD0C4DB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BDFA84D6-6C6B-44C9-ABC5-563CFD0C4DB5}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{BDFA84D6-6C6B-44C9-ABC5-563CFD0C4DB5}.Debug|ARM.Build.0 = Debug|Any CPU
+		{BDFA84D6-6C6B-44C9-ABC5-563CFD0C4DB5}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{BDFA84D6-6C6B-44C9-ABC5-563CFD0C4DB5}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{BDFA84D6-6C6B-44C9-ABC5-563CFD0C4DB5}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{BDFA84D6-6C6B-44C9-ABC5-563CFD0C4DB5}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{BDFA84D6-6C6B-44C9-ABC5-563CFD0C4DB5}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{BDFA84D6-6C6B-44C9-ABC5-563CFD0C4DB5}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{BDFA84D6-6C6B-44C9-ABC5-563CFD0C4DB5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BDFA84D6-6C6B-44C9-ABC5-563CFD0C4DB5}.Debug|x64.Build.0 = Debug|Any CPU
+		{BDFA84D6-6C6B-44C9-ABC5-563CFD0C4DB5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BDFA84D6-6C6B-44C9-ABC5-563CFD0C4DB5}.Debug|x86.Build.0 = Debug|Any CPU
+		{BDFA84D6-6C6B-44C9-ABC5-563CFD0C4DB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BDFA84D6-6C6B-44C9-ABC5-563CFD0C4DB5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BDFA84D6-6C6B-44C9-ABC5-563CFD0C4DB5}.Release|ARM.ActiveCfg = Release|Any CPU
+		{BDFA84D6-6C6B-44C9-ABC5-563CFD0C4DB5}.Release|ARM.Build.0 = Release|Any CPU
+		{BDFA84D6-6C6B-44C9-ABC5-563CFD0C4DB5}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{BDFA84D6-6C6B-44C9-ABC5-563CFD0C4DB5}.Release|ARM64.Build.0 = Release|Any CPU
+		{BDFA84D6-6C6B-44C9-ABC5-563CFD0C4DB5}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{BDFA84D6-6C6B-44C9-ABC5-563CFD0C4DB5}.Release|iPhone.Build.0 = Release|Any CPU
+		{BDFA84D6-6C6B-44C9-ABC5-563CFD0C4DB5}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{BDFA84D6-6C6B-44C9-ABC5-563CFD0C4DB5}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{BDFA84D6-6C6B-44C9-ABC5-563CFD0C4DB5}.Release|x64.ActiveCfg = Release|Any CPU
+		{BDFA84D6-6C6B-44C9-ABC5-563CFD0C4DB5}.Release|x64.Build.0 = Release|Any CPU
+		{BDFA84D6-6C6B-44C9-ABC5-563CFD0C4DB5}.Release|x86.ActiveCfg = Release|Any CPU
+		{BDFA84D6-6C6B-44C9-ABC5-563CFD0C4DB5}.Release|x86.Build.0 = Release|Any CPU
+		{D816B818-F58F-4738-93AE-924EFAB7A07F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D816B818-F58F-4738-93AE-924EFAB7A07F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D816B818-F58F-4738-93AE-924EFAB7A07F}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{D816B818-F58F-4738-93AE-924EFAB7A07F}.Debug|ARM.Build.0 = Debug|Any CPU
+		{D816B818-F58F-4738-93AE-924EFAB7A07F}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{D816B818-F58F-4738-93AE-924EFAB7A07F}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{D816B818-F58F-4738-93AE-924EFAB7A07F}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{D816B818-F58F-4738-93AE-924EFAB7A07F}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{D816B818-F58F-4738-93AE-924EFAB7A07F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{D816B818-F58F-4738-93AE-924EFAB7A07F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{D816B818-F58F-4738-93AE-924EFAB7A07F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D816B818-F58F-4738-93AE-924EFAB7A07F}.Debug|x64.Build.0 = Debug|Any CPU
+		{D816B818-F58F-4738-93AE-924EFAB7A07F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D816B818-F58F-4738-93AE-924EFAB7A07F}.Debug|x86.Build.0 = Debug|Any CPU
+		{D816B818-F58F-4738-93AE-924EFAB7A07F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D816B818-F58F-4738-93AE-924EFAB7A07F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D816B818-F58F-4738-93AE-924EFAB7A07F}.Release|ARM.ActiveCfg = Release|Any CPU
+		{D816B818-F58F-4738-93AE-924EFAB7A07F}.Release|ARM.Build.0 = Release|Any CPU
+		{D816B818-F58F-4738-93AE-924EFAB7A07F}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{D816B818-F58F-4738-93AE-924EFAB7A07F}.Release|ARM64.Build.0 = Release|Any CPU
+		{D816B818-F58F-4738-93AE-924EFAB7A07F}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{D816B818-F58F-4738-93AE-924EFAB7A07F}.Release|iPhone.Build.0 = Release|Any CPU
+		{D816B818-F58F-4738-93AE-924EFAB7A07F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{D816B818-F58F-4738-93AE-924EFAB7A07F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{D816B818-F58F-4738-93AE-924EFAB7A07F}.Release|x64.ActiveCfg = Release|Any CPU
+		{D816B818-F58F-4738-93AE-924EFAB7A07F}.Release|x64.Build.0 = Release|Any CPU
+		{D816B818-F58F-4738-93AE-924EFAB7A07F}.Release|x86.ActiveCfg = Release|Any CPU
+		{D816B818-F58F-4738-93AE-924EFAB7A07F}.Release|x86.Build.0 = Release|Any CPU
+		{B5F94CCB-5868-43BD-89B5-B66C97C3A741}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B5F94CCB-5868-43BD-89B5-B66C97C3A741}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B5F94CCB-5868-43BD-89B5-B66C97C3A741}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{B5F94CCB-5868-43BD-89B5-B66C97C3A741}.Debug|ARM.Build.0 = Debug|Any CPU
+		{B5F94CCB-5868-43BD-89B5-B66C97C3A741}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{B5F94CCB-5868-43BD-89B5-B66C97C3A741}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{B5F94CCB-5868-43BD-89B5-B66C97C3A741}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{B5F94CCB-5868-43BD-89B5-B66C97C3A741}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{B5F94CCB-5868-43BD-89B5-B66C97C3A741}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{B5F94CCB-5868-43BD-89B5-B66C97C3A741}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{B5F94CCB-5868-43BD-89B5-B66C97C3A741}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B5F94CCB-5868-43BD-89B5-B66C97C3A741}.Debug|x64.Build.0 = Debug|Any CPU
+		{B5F94CCB-5868-43BD-89B5-B66C97C3A741}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B5F94CCB-5868-43BD-89B5-B66C97C3A741}.Debug|x86.Build.0 = Debug|Any CPU
+		{B5F94CCB-5868-43BD-89B5-B66C97C3A741}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B5F94CCB-5868-43BD-89B5-B66C97C3A741}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B5F94CCB-5868-43BD-89B5-B66C97C3A741}.Release|ARM.ActiveCfg = Release|Any CPU
+		{B5F94CCB-5868-43BD-89B5-B66C97C3A741}.Release|ARM.Build.0 = Release|Any CPU
+		{B5F94CCB-5868-43BD-89B5-B66C97C3A741}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{B5F94CCB-5868-43BD-89B5-B66C97C3A741}.Release|ARM64.Build.0 = Release|Any CPU
+		{B5F94CCB-5868-43BD-89B5-B66C97C3A741}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{B5F94CCB-5868-43BD-89B5-B66C97C3A741}.Release|iPhone.Build.0 = Release|Any CPU
+		{B5F94CCB-5868-43BD-89B5-B66C97C3A741}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{B5F94CCB-5868-43BD-89B5-B66C97C3A741}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{B5F94CCB-5868-43BD-89B5-B66C97C3A741}.Release|x64.ActiveCfg = Release|Any CPU
+		{B5F94CCB-5868-43BD-89B5-B66C97C3A741}.Release|x64.Build.0 = Release|Any CPU
+		{B5F94CCB-5868-43BD-89B5-B66C97C3A741}.Release|x86.ActiveCfg = Release|Any CPU
+		{B5F94CCB-5868-43BD-89B5-B66C97C3A741}.Release|x86.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{9AD757F5-E57A-459D-A0A7-E0675E045B84} = {97FA536A-675D-41C7-A90E-97E2F79D1AE2}
+		{29AC50BF-B4FB-450B-9386-0C5AD4B84226} = {97FA536A-675D-41C7-A90E-97E2F79D1AE2}
+		{57B8B73D-C3B5-4C42-869E-7B2F17D354AC} = {D5B986A3-7FC9-437E-8030-349AA4698DFD}
+		{423C21C8-84CB-4A3C-BEB9-1C23D752D90F} = {31721EFD-3238-462B-B501-41F3D2B50E92}
+		{2ACC7FFA-238F-44FD-93CB-4D9B17D8C4BA} = {31721EFD-3238-462B-B501-41F3D2B50E92}
+		{29913989-0F70-48D8-8EDE-B1DD217F21D1} = {423C21C8-84CB-4A3C-BEB9-1C23D752D90F}
+		{271193C1-6E7C-429C-A36D-3F1BE5267231} = {29AC50BF-B4FB-450B-9386-0C5AD4B84226}
+		{D5B986A3-7FC9-437E-8030-349AA4698DFD} = {9AD757F5-E57A-459D-A0A7-E0675E045B84}
+		{75A2CD30-BB85-4CA6-AC95-86A8A538A690} = {9AD757F5-E57A-459D-A0A7-E0675E045B84}
+		{00259593-A283-47A5-ACB7-9C3819B16364} = {75A2CD30-BB85-4CA6-AC95-86A8A538A690}
+		{BB98A559-62C4-4C98-90A0-9E4D8DF1CA27} = {D5B986A3-7FC9-437E-8030-349AA4698DFD}
+		{C328C538-B69F-43D2-80EE-3C1EB8254CBA} = {D5B986A3-7FC9-437E-8030-349AA4698DFD}
+		{7A753001-1C3D-404D-A421-2E052A545EAC} = {2ACC7FFA-238F-44FD-93CB-4D9B17D8C4BA}
+		{DA9E4D76-8CA4-4CC3-A47C-BA75DFF805C6} = {2ACC7FFA-238F-44FD-93CB-4D9B17D8C4BA}
+		{A0B8D99F-4C0E-4D47-8182-9E8879A9B105} = {2ACC7FFA-238F-44FD-93CB-4D9B17D8C4BA}
+		{EE8FC716-27FC-405B-BD27-AF17E01A6671} = {2ACC7FFA-238F-44FD-93CB-4D9B17D8C4BA}
+		{7E12E071-51C0-4668-9FF3-E2DE9DC51962} = {DFD73007-5DB1-43AD-87A8-BD8622C2B192}
+		{8CB95D25-8442-42BC-82BE-319D21138549} = {7E12E071-51C0-4668-9FF3-E2DE9DC51962}
+		{99FDF6CA-DCF8-4CB2-B2EA-E24CCB601232} = {DFD73007-5DB1-43AD-87A8-BD8622C2B192}
+		{2E0EB4A3-3C4A-4A5E-8D2F-F77C62464886} = {99FDF6CA-DCF8-4CB2-B2EA-E24CCB601232}
+		{B73EB308-70BE-49FD-91A7-1D1495663D6D} = {99FDF6CA-DCF8-4CB2-B2EA-E24CCB601232}
+		{81128D28-CFC8-4EA4-B68D-9939339C461A} = {99FDF6CA-DCF8-4CB2-B2EA-E24CCB601232}
+		{5817A848-0B04-4035-9F7E-B8621B61CBDD} = {DFD73007-5DB1-43AD-87A8-BD8622C2B192}
+		{AB6242B7-634F-4839-A991-7629D0D2C636} = {5817A848-0B04-4035-9F7E-B8621B61CBDD}
+		{2C69EB76-02C4-4921-96A1-4D70CB7CE744} = {5817A848-0B04-4035-9F7E-B8621B61CBDD}
+		{0C1B038F-F5CD-4E3C-B9D7-040F020BA44C} = {5817A848-0B04-4035-9F7E-B8621B61CBDD}
+		{73100F0D-C0BB-4F16-8FC2-FA3FA8ACD424} = {2ACC7FFA-238F-44FD-93CB-4D9B17D8C4BA}
+		{806499EB-C2CC-4E85-BC19-613F3DE5E0C3} = {9AD757F5-E57A-459D-A0A7-E0675E045B84}
+		{90B727DD-4C7B-4462-950F-61842A87DE8A} = {806499EB-C2CC-4E85-BC19-613F3DE5E0C3}
+		{D51AD52D-C4C6-445A-BD0F-884BE5C1C526} = {806499EB-C2CC-4E85-BC19-613F3DE5E0C3}
+		{F2379E0F-524F-47BC-877C-0428E4C836D4} = {D5B986A3-7FC9-437E-8030-349AA4698DFD}
+		{F905B72C-4DF7-408B-8B2B-50F9B8246A5E} = {75A2CD30-BB85-4CA6-AC95-86A8A538A690}
+		{E4CB9988-7348-4D55-A08E-85907732F8DA} = {0F9BA970-11B1-4ACA-AF41-1021AFC0F29C}
+		{551B2209-4298-4D60-B55C-79077B8BC244} = {0F9BA970-11B1-4ACA-AF41-1021AFC0F29C}
+		{4A3BAF64-E9D9-4036-9FDA-8B326C382667} = {15878D2D-B0F1-4EE9-875D-4A643DB0C842}
+		{F83AC93C-9694-4A01-B9CB-7AA8E514B01F} = {4A3BAF64-E9D9-4036-9FDA-8B326C382667}
+		{08F720FF-7530-43BF-A252-8946927669E3} = {4A3BAF64-E9D9-4036-9FDA-8B326C382667}
+		{3E1D0DED-6B13-42C8-AA15-2EDFD8ECE80C} = {08F720FF-7530-43BF-A252-8946927669E3}
+		{BDFA84D6-6C6B-44C9-ABC5-563CFD0C4DB5} = {F83AC93C-9694-4A01-B9CB-7AA8E514B01F}
+		{D816B818-F58F-4738-93AE-924EFAB7A07F} = {75A2CD30-BB85-4CA6-AC95-86A8A538A690}
+		{AE2513CB-4E5E-4E5C-8237-88954D4C9433} = {75A2CD30-BB85-4CA6-AC95-86A8A538A690}
+		{B5F94CCB-5868-43BD-89B5-B66C97C3A741} = {75A2CD30-BB85-4CA6-AC95-86A8A538A690}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {650AE971-2F29-46A8-822C-FB4FCDC6A9A0}
+	EndGlobalSection
+EndGlobal
diff --git a/README.md b/README.md
index 3f464372dfde..78090812abbc 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@
 ## Maui.sln
 
 ### SDKS required
-- Install the SDKs listed here https://github.com/xamarin/net6-samples
+- Install the SDKs listed here https://github.com/dotnet/net6-mobile-samples
 
 - And/or run the following
 
@@ -50,7 +50,7 @@ dotnet build src\DotNet\DotNet.csproj
 # Builds the rest of Maui
 .\bin\dotnet\dotnet build Microsoft.Maui-net6.sln
 # (Windows-only) to launch Visual Studio
-.\eng\dogfood.ps1
+dotnet cake --target=VS-DOGFOOD
 ```
 
 To build & run .NET 6 sample apps, you will also need to use `.\bin\dotnet\dotnet`:
@@ -68,19 +68,22 @@ Try out a "single project", you will need the `-f` switch to choose the platform
 
 ## Current News
 
+[April 21, 2021 - WinUI Community Live Stream](https://youtu.be/SyLXctia1B0?t=777)
+
+[April 21, 2021 - InfoQ Interview with David Ortinau](https://www.infoq.com/articles/net-maui/)
+
 [April 9, 2021 - Announcing .NET Multi-platform App UI Preview 3](https://devblogs.microsoft.com/dotnet/announcing-net-multi-platform-app-ui-preview-3/)
 
 [April 9, 2021 - Xamarin Podcast - .NET MAUI Q&A](https://www.xamarinpodcast.com/90)
 
-[March 11, 2021 - Announcing .NET 6 Preview 2](https://devblogs.microsoft.com/dotnet/announcing-net-6-preview-2/)
+[April 6, 2021 - On .NET with guest Maddy Leger - A Journey to .NET MAUI](https://www.youtube.com/watch?v=hoC5FIblKz8)
 
-Watch our [March 2021 .NET Community Standup report](https://youtu.be/NEbRo0ltniM?t=1242) for the latest information about our progress on .NET MAUI and .NET 6. 
-
-[![](https://user-images.githubusercontent.com/41873/110172514-e1c76280-7dc2-11eb-8407-50760881d1ec.png
-)](https://www.youtube.com/watch?v=5bK2ICHtMxo)
+[April 1, 2021 - Xamarin Community Standup with Guest Jonathan Peppers discussing .NET 6 Project System updates](https://www.youtube.com/watch?v=su3ntRjEN1I)
 
 Additional live streams and presentations:
 
+* March 11, 2021 - [Announcing .NET 6 Preview 2](https://devblogs.microsoft.com/dotnet/announcing-net-6-preview-2/)
+* March 2021 - [.NET Community Standup report](https://youtu.be/NEbRo0ltniM?t=1242) 
 * February 25, 2021 - David Ortinau and Maddy Leger at .NET Conf: Focus on Windows: [The Future of Client App Development in .NET 6](https://www.youtube.com/watch?v=fPEdgXeqhE4)
 * January 28, 2021 - David Ortinau at .NET Frontend Day: [A .NET MAUI Progress Report](https://youtu.be/RnyZZKjdUxk)
 * September 19, 2020 - Shane Neuville at ReactiveUI Virtual Conference: [Dual Screen, .NET MAUI, and RxUI](https://www.youtube.com/watch?v=Rkz6Dkk1uWU)
@@ -88,77 +91,6 @@ Additional live streams and presentations:
 * October 3, 2020 - David Ortinau at Xamarin Expert Day: [Introducing .NET MAUI](https://youtu.be/qbHO8J3bId0)
 * December 2, 2020 - Javier Suarez Ruiz at MonkeyConf: [.NET MAUI Handlers](https://youtu.be/TBMauxRGkiI) (Spanish)
 
-## Status: Active Development
-
-While [Xamarin.Forms](https://github.com/xamarin/xamarin.forms) continues to be actively supported through November 2022, we are making evolutionary changes based on customer research of what would be most beneficial. Current areas of focus are:
-
-* Porting renderers to handlers ([spec](https://github.com/dotnet/maui/issues/28))
-* Adapting layouts for handlers
-* WinUI 3 preview 3 early spike ([branch](https://github.com/xamarin/Xamarin.Forms/tree/winui3))
-* Mac Catalyst early evaluation ([wiki](https://github.com/xamarin/xamarin-macios/wiki/Mac-Catalyst-(Early-Preview)))
-
-Active development is happening today to build Android and iOS SDKs against .NET 6. [Samples may be found here](https://github.com/xamarin/net6-samples).
-
-### Goals
-
-* Improve app performance
-* Improve simplicity of control extensibility
-* Improve simplicity of contributing
-* Enable developer options to use Model-View-Update (MVU) and Blazor
-
-### Roadmap
-
-.NET MAUI and mobile SDK support will ship in concert with .NET 6. At present we do not have a shipping schedule for .NET 6.
-
-### Milestones
-
-* .NET MAUI previews Q4 2020 through Q3 2021
-  * [Renderer architecture revisions](https://github.com/dotnet/maui/issues/28)
-  * Source solution and project simplification
-  * Complete approved proposals
-  * Implement MVU (experimental)
-* .NET MAUI release candidate September 2021
-* .NET MAUI general availability November 2021
-
-## Xamarin.Forms vs .NET MAUI
-
-
-|  |Xamarin.Forms  |.NET MAUI  |
-|---------|---------|---------|
-|**Platforms**     |         |         |
-|Android     |API 19+        |API 21+        |
-|iOS     |9-15         |10+         |
-|Linux     |Community         |Community         |
-|macOS     |Community         |Microsoft         |
-|Tizen     |Samsung           |Samsung           |
-|Windows     |UWP Microsoft<br/>WPF Community         |Microsoft<sup>*</sup>         |
-|**Features**     |         |         |
-|Renderers     |Tightly coupled to BindableObject         |Loosely coupled, no Xamarin.Forms dependencies         |
-|App Models     |MVVM         |MVVM         |
-|     |RxUI         |RxUI         |
-|     |             |MVU <sup>**</sup> |
-|     |             |Blazor <sup>**</sup> |
-|Single Project     |No         |Yes         |
-|Multi-targeting     |No         |Yes         |
-|Multi-window     |No         |Yes         |
-|**Misc**     |         |         |
-|.NET     |Xamarin.iOS, Xamarin.Android, Mono, .NET Framework, ...         |.NET 6+         |
-|XAML Hot Reload|Experimental: SDK 4.x & Visual Studio 2019 prior to version 16.9<br>Feature Complete: SDK 5.x & Visual Studio 2019 version 16.9 or newer|Yes|
-|.NET Hot Reload|iOS/Android – No<br>UWP – Limited support for runtime edits using .NET “Edit & Continue”|Yes|
-|Acquisition |NuGet & Visual Studio Installer |dotnet |
-|Project System     |Franken-proj         |SDK Style         |
-|dotnet CLI     |No         |Yes         |
-|**Tools**     |         |         |
-|Visual Studio 2019     |Yes         |Yes         |
-|Visual Studio 2019 for Mac     |Yes         |Yes         |
-|Visual Studio Code     |No         |Experimental<sup>***</sup>         |
-
-<sup>*</sup> The Windows implementation is expected to be WinUI 3, pending GA release. 
-
-<sup>**</sup> These app models are experimental.
-
-<sup>***</sup> Visual Studio Code will work by virtue of .NET unification, however not all experiences that make .NET MAUI development delightful (intellisense for example) may be enabled at the time of .NET 6 release.
-
 ## FAQs
 
 Do you have questions? Do not worry, we have prepared a complete [FAQ](https://github.com/dotnet/maui/wiki/FAQs) answering the most common questions.
diff --git a/build.cake b/build.cake
index 6a900f996297..97205be517cd 100644
--- a/build.cake
+++ b/build.cake
@@ -22,6 +22,8 @@ PowerShell:
 #addin "nuget:?package=Cake.Boots&version=1.0.4.600-preview1"
 #addin "nuget:?package=Cake.AppleSimulator&version=0.2.0"
 #addin "nuget:?package=Cake.FileHelpers&version=3.2.1"
+#load "eng/cake/dotnet.cake"
+#load "eng/cake/helpers.cake"
 
 //////////////////////////////////////////////////////////////////////
 // TOOLS
@@ -37,7 +39,9 @@ string agentName = EnvironmentVariable("AGENT_NAME", "");
 bool isCIBuild = !String.IsNullOrWhiteSpace(agentName);
 string artifactStagingDirectory = EnvironmentVariable("BUILD_ARTIFACTSTAGINGDIRECTORY", ".");
 string workingDirectory = EnvironmentVariable("SYSTEM_DEFAULTWORKINGDIRECTORY", ".");
-var configuration = Argument("BUILD_CONFIGURATION", "Debug");
+string envProgramFiles = EnvironmentVariable("ProgramFiles(x86)");
+var configuration = GetBuildVariable("BUILD_CONFIGURATION", GetBuildVariable("configuration", "DEBUG"));
+var msbuildPath = GetBuildVariable("msbuild", $"{envProgramFiles}\\Microsoft Visual Studio\\2019\\Enterprise\\MSBuild\\Current\\Bin\\MSBuild.exe");
 
 var target = Argument("target", "Default");
 if(String.IsNullOrWhiteSpace(target))
@@ -162,6 +166,8 @@ Information ("artifactStagingDirectory: {0}", artifactStagingDirectory);
 Information("workingDirectory: {0}", workingDirectory);
 Information("NUNIT_TEST_WHERE: {0}", NUNIT_TEST_WHERE);
 Information("TARGET: {0}", target);
+Information("MSBUILD: {0}", msbuildPath);
+
 
 var releaseChannel = ReleaseChannel.Stable;
 if(releaseChannelArg == "Preview")
@@ -237,26 +243,27 @@ Information ("iosSDK: {0}", iosSDK);
 // TASKS
 //////////////////////////////////////////////////////////////////////
 
-Task("Clean")
-    .Description("Deletes all the obj/bin directories")
+Task("BuildUnitTests")
+    .IsDependentOn("BuildTasks")
+    .Description("Builds all necessary projects to run Unit Tests")
     .Does(() =>
 {
-    List<string> foldersToClean = new List<string>();
-
-    foreach (var item in new [] {"obj", "bin"})
+    try
     {
-        foreach(string f in System.IO.Directory.GetDirectories(".", item, SearchOption.AllDirectories))
-        {
-            if(f.StartsWith(@".\bin") || f.StartsWith(@".\tools"))
-                continue;
-
-            // this is here as a safety check
-            if(!f.StartsWith(@".\src"))
-                continue;
+        var msbuildSettings = GetMSBuildSettings();
+        var binaryLogger = new MSBuildBinaryLogSettings {
+            Enabled  = isCIBuild
+        };
 
-            CleanDirectories(f);
-        }        
-    } 
+        msbuildSettings.BinaryLogger = binaryLogger;
+        binaryLogger.FileName = $"{artifactStagingDirectory}/Maui.Controls-{configuration}.binlog";
+        MSBuild("./Microsoft.Maui.sln", msbuildSettings.WithRestore());
+    }
+    catch(Exception)
+    {
+        if(IsRunningOnWindows())
+            throw;
+    }
 });
 
 Task("provision-macsdk")
@@ -678,19 +685,6 @@ Task("provision")
     .IsDependentOn("provision-windowssdk")
     .IsDependentOn("provision-monosdk"); // always provision monosdk last otherwise CI might fail
 
-Task("NuGetPack")
-    .Description("Build and Create Nugets").Does(()=> {
-        
-    var settings = new DotNetCoreToolSettings
-    {
-        DiagnosticOutput = true,
-        ArgumentCustomization = args => args.Append($"./eng/package.ps1 -configuration \"{configuration}\"")
-    };
-
-   DotNetCoreTool("pwsh", settings);
-
-});;
-
 Task("provision-powershell").Does(()=> {
     var settings = new DotNetCoreToolSettings
     {
@@ -728,144 +722,6 @@ Task("WriteGoogleMapsAPIKey")
         }
     });
 
-Task("BuildForNuget")
-    .IsDependentOn("BuildTasks")
-    .Description("Builds all necessary projects to create Nuget Packages")
-    .Does(() =>
-{
-    try
-    {
-        var msbuildSettings = GetMSBuildSettings();
-        var binaryLogger = new MSBuildBinaryLogSettings {
-            Enabled  = isCIBuild
-        };
-
-        msbuildSettings.BinaryLogger = binaryLogger;
-        binaryLogger.FileName = $"{artifactStagingDirectory}/Maui.Controls-{configuration}.binlog";
-        MSBuild(MAUI_SLN, msbuildSettings.WithRestore());
-        
-        // // This currently fails on CI will revisit later
-        // if(isCIBuild)
-        // {        
-        //     MSBuild("./Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj", GetMSBuildSettings().WithTarget("Restore"));
-        //     MSBuild("./Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj", GetMSBuildSettings());
-        // }
-
-        // MSBuild(MAUI_SLN, GetMSBuildSettings().WithTarget("Restore"));
-        // MSBuild("./Xamarin.Forms.DualScreen.sln", GetMSBuildSettings().WithTarget("Restore"));
-
-        // if(isCIBuild)
-        // {       
-        //     foreach(var platformProject in GetFiles("./Xamarin.*.UnitTests/*.csproj").Select(x=> x.FullPath))
-        //     {
-        //         if(platformProject.Contains("Xamarin.Forms.Xaml.UnitTests"))
-        //             continue;
-
-        //         Information("Building: {0}", platformProject);
-        //         MSBuild(platformProject,
-        //                 GetMSBuildSettings().WithRestore());
-        //     }
-        // }
-
-        // MSBuild(MAUI_SLN, GetMSBuildSettings().WithTarget("Restore"));
-        // MSBuild("./Xamarin.Forms.DualScreen.sln", GetMSBuildSettings().WithTarget("Restore"));
-        
-        // msbuildSettings.BinaryLogger = binaryLogger;
-        
-        // var platformProjects = 
-        //     GetFiles("./Xamarin.Forms.Platform.*/*.csproj")
-        //         .Union(GetFiles("./Stubs/*/*.csproj"))
-        //         .Union(GetFiles("./Xamarin.Forms.Maps.*/*.csproj"))
-        //         .Union(GetFiles("./Xamarin.Forms.Pages.*/*.csproj"))
-        //         .Union(GetFiles("./Xamarin.Forms.Material.*/*.csproj"))
-        //         .Union(GetFiles("./Xamarin.Forms.Core.Design/*.csproj"))
-        //         .Union(GetFiles("./Xamarin.Forms.Xaml.Design/*.csproj"))
-        //         .Select(x=> x.FullPath).Distinct()
-        //         .ToList();
-
-        // foreach(var platformProject in platformProjects)
-        // {
-        //     if(platformProject.Contains("UnitTests"))
-        //         continue;
-                
-        //     msbuildSettings = GetMSBuildSettings();
-        //     string projectName = platformProject
-        //         .Replace(' ', '_')
-        //         .Split('/')
-        //         .Last();
-
-        //     binaryLogger.FileName = $"{artifactStagingDirectory}/{projectName}-{configuration}.binlog";
-        //     msbuildSettings.BinaryLogger = binaryLogger;
-
-        //     Information("Building: {0}", platformProject);
-        //     MSBuild(platformProject,
-        //             msbuildSettings);
-        // }
-
-        // dual screen
-
-
-         // XAML Tests are currently having issues compiling in Release Mode
-        // if(configuration == "Debug")
-        // {
-        //     msbuildSettings = GetMSBuildSettings();
-        //     msbuildSettings.BinaryLogger = binaryLogger;
-        //     binaryLogger.FileName = $"{artifactStagingDirectory}/ControlGallery-{configuration}.binlog";
-        //    MSBuild(CONTROLGALLERY_SLN, msbuildSettings.WithRestore());
-        // }
-
-        if(IsRunningOnWindows())
-        {
-        //     msbuildSettings = GetMSBuildSettings();
-        //     msbuildSettings.BinaryLogger = binaryLogger;
-        //     binaryLogger.FileName = $"{artifactStagingDirectory}/dualscreen-{configuration}-csproj.binlog";
-        //     MSBuild("./Xamarin.Forms.DualScreen/Xamarin.Forms.DualScreen.csproj",
-        //                 msbuildSettings
-        //                     .WithRestore()
-        //                     .WithTarget("rebuild"));
-
-
-	    //     msbuildSettings = GetMSBuildSettings();
-	    //     msbuildSettings.BinaryLogger = binaryLogger;
-	    //     binaryLogger.FileName = $"{artifactStagingDirectory}/win-maps-{configuration}-csproj.binlog";
-	    //     MSBuild("./Xamarin.Forms.Maps.UWP/Xamarin.Forms.Maps.UWP.csproj",
-	    //                 msbuildSettings
-	    //                     .WithProperty("UwpMinTargetFrameworks", "uap10.0.14393")
-	    //                     .WithRestore());
-	
-	        // msbuildSettings = GetMSBuildSettings();
-	        // msbuildSettings.BinaryLogger = binaryLogger;
-	        // binaryLogger.FileName = $"{artifactStagingDirectory}/win-{configuration}-csproj.binlog";
-	        // MSBuild("./src/Compatibility/Core/src/UAP/Compatibility.UAP.csproj",
-	        //             msbuildSettings
-	        //                 .WithRestore()
-	        //                 .WithTarget("rebuild")
-	        //                 .WithProperty("DisableEmbeddedXbf", "false")
-	        //                 .WithProperty("EnableTypeInfoReflection", "false"));
-
-        //     msbuildSettings = GetMSBuildSettings();
-        //     msbuildSettings.BinaryLogger = binaryLogger;
-        //     binaryLogger.FileName = $"{artifactStagingDirectory}/ios-{configuration}-csproj.binlog";
-        //     MSBuild("./Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.csproj",
-        //                 msbuildSettings
-        //                     .WithTarget("rebuild"));
-
-        //     msbuildSettings = GetMSBuildSettings();
-        //     msbuildSettings.BinaryLogger = binaryLogger;
-        //     binaryLogger.FileName = $"{artifactStagingDirectory}/macos-{configuration}-csproj.binlog";
-        //     MSBuild("./Xamarin.Forms.Platform.MacOS/Xamarin.Forms.Platform.MacOS.csproj",
-        //                 msbuildSettings
-        //                     .WithTarget("rebuild"));
-        }
-
-    }
-    catch(Exception)
-    {
-        if(IsRunningOnWindows())
-            throw;
-    }
-});
-
 Task("BuildTasks")
     .Description($"Build {BUILD_TASKS_PROJ}")
     .Does(() =>
@@ -898,35 +754,6 @@ Task("Android100")
                     .WithProperty("AndroidTargetFrameworks", "MonoAndroid10.0"));
     });
 
-
-Task("VS-NET6")
-    .Does(() =>
-    {
-        DotNetCoreBuild("./src/DotNet/Dotnet.csproj");
-        var ext = IsRunningOnWindows() ? ".exe" : "";
-        DotNetCoreBuild("./Microsoft.Maui.BuildTasks-net6.sln", new DotNetCoreBuildSettings { ToolPath = $"./bin/dotnet/dotnet{ext}" });
-        StartVisualStudioForDotNet6();
-    });
-
-
-Task("VS-WINUI")
-    .IsDependentOn("Clean")
-    .Does(() =>
-    {
-        DotNetCoreBuild("./src/DotNet/Dotnet.csproj");
-        var ext = IsRunningOnWindows() ? ".exe" : "";
-        
-        StartProcess("powershell", $"./eng/dogfood.ps1 -JustCreateGlobalJSON");
-        DotNetCoreBuild("./Microsoft.Maui.BuildTasks-net6.sln", new DotNetCoreBuildSettings { ToolPath = $"./bin/dotnet/dotnet{ext}" });
-        
-
-        MSBuild("Microsoft.Maui.WinUI.sln",
-                GetMSBuildSettings(includePrerelease:true).
-                WithRestore());
-
-        StartVisualStudioForDotNet6("./Microsoft.Maui.WinUI.sln");
-    });
-
 Task("VS")
     .Description("Builds projects necessary so solution compiles on VS")
     .IsDependentOn("Clean")
@@ -1186,9 +1013,7 @@ Task ("cg-ios-deploy")
 // TASK TARGETS
 //////////////////////////////////////////////////////////////////////
 
-Task("Default")
-    .IsDependentOn("NugetPack")
-    ;
+Task("Default").IsDependentOn("dotnet-pack");
 
 //////////////////////////////////////////////////////////////////////
 // EXECUTION
@@ -1228,14 +1053,6 @@ void RunTests(string unitTestLibrary, NUnit3Settings settings, ICakeContext ctx)
     }
 }
 
-T GetBuildVariable<T>(string key, T defaultValue)
-{
-    // on MAC all environment variables are upper case regardless of how you specify them in devops
-    // And then Environment Variable check is case sensitive
-    T upperCaseReturnValue = Argument(key.ToUpper(), EnvironmentVariable(key.ToUpper(), defaultValue));
-    return Argument(key, EnvironmentVariable(key, upperCaseReturnValue));
-}
-
 void StartVisualStudio(string sln = "./Microsoft.Maui.sln")
 {
     if(isCIBuild)
@@ -1255,22 +1072,6 @@ void StartVisualStudio(string sln = "./Microsoft.Maui.sln")
          StartProcess("open", new ProcessSettings{ Arguments = sln });
 }
 
-void StartVisualStudioForDotNet6(string sln = "./Microsoft.Maui-net6.sln")
-{
-    if (isCIBuild)
-        return;
-    if (!IsRunningOnWindows())
-    {
-        Information("This target is only supported on Windows.");
-        return;
-    }
-    var vsLatest = VSWhereLatest(new VSWhereLatestSettings { IncludePrerelease = true, });
-    if (vsLatest == null)
-        throw new Exception("Unable to find Visual Studio!");
-    var devenv = vsLatest.CombineWithFilePath("./Common7/IDE/devenv.exe");
-    StartProcess("powershell", $"./eng/dogfood.ps1 -vs '{devenv}' -sln '{sln}'");
-}
-
 MSBuildSettings GetMSBuildSettings(
     PlatformTarget? platformTarget = PlatformTarget.MSIL, 
     string buildConfiguration = null,
@@ -1479,4 +1280,4 @@ public string ParseDevOpsInputs(string nunitWhere)
     }
 
     return returnValue;
-}
+}
\ No newline at end of file
diff --git a/eng/AndroidX.targets b/eng/AndroidX.targets
index e0f88d9281e7..495deb1ffdee 100644
--- a/eng/AndroidX.targets
+++ b/eng/AndroidX.targets
@@ -19,6 +19,22 @@
         Update="Xamarin.AndroidX.Lifecycle.LiveData"
         Version="2.3.1-$(_AndroidXVersion)"
     />
+    <PackageReference
+        Update="Xamarin.AndroidX.Navigation.UI"
+        Version="2.3.5-$(_AndroidXVersion)"
+    />
+    <PackageReference
+        Update="Xamarin.AndroidX.Navigation.Fragment"
+        Version="2.3.5-$(_AndroidXVersion)"
+    />
+    <PackageReference
+        Update="Xamarin.AndroidX.Navigation.Runtime"
+        Version="2.3.5-$(_AndroidXVersion)"
+    />
+    <PackageReference
+        Update="Xamarin.AndroidX.Navigation.Common"
+        Version="2.3.5-$(_AndroidXVersion)"
+    />
     <PackageReference
         Update="Xamarin.AndroidX.MediaRouter"
         Version="1.2.2.1-$(_AndroidXVersion)"
diff --git a/eng/Microsoft.Extensions.targets b/eng/Microsoft.Extensions.targets
index bdb52bd4d86b..27f5fc4496e6 100644
--- a/eng/Microsoft.Extensions.targets
+++ b/eng/Microsoft.Extensions.targets
@@ -10,7 +10,8 @@
   <PropertyGroup>
     <_MicrosoftProjectReunionVersion>0.5.0</_MicrosoftProjectReunionVersion>
     <_MicrosoftGraphicsWin2DVersion>0.5.0.13</_MicrosoftGraphicsWin2DVersion>
-    <_MicrosoftMauiGraphics>6.0.100-preview.3.61</_MicrosoftMauiGraphics>
+    <_MicrosoftMauiGraphics>6.0.100-preview.4.78</_MicrosoftMauiGraphics>
+    <_XamarinAndroidGlideVersion>4.11.0.1</_XamarinAndroidGlideVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)' == 'net6.0-ios' Or '$(TargetFramework)' == 'net6.0-maccatalyst'">
     <!-- Debugger workaround -->
@@ -40,6 +41,14 @@
         Update="Microsoft.Extensions.Logging"
         Version="$(_MicrosoftHostingVersion)"
     />
+    <PackageReference
+        Update="Microsoft.Extensions.Logging.Console"
+        Version="$(_MicrosoftHostingVersion)"
+    />
+    <PackageReference
+        Update="Microsoft.Extensions.Logging.Debug"
+        Version="$(_MicrosoftHostingVersion)"
+    />
     <PackageReference
         Update="Microsoft.ProjectReunion"
         Version="$(_MicrosoftProjectReunionVersion)"
@@ -56,5 +65,9 @@
         Update="Microsoft.Graphics.Win2D"
         Version="$(_MicrosoftGraphicsWin2DVersion)"
     />
+    <PackageReference
+        Update="Xamarin.Android.Glide"
+        Version="$(_XamarinAndroidGlideVersion)"
+    />
   </ItemGroup>
 </Project>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 7cb4819df4e4..0b30e8d00e08 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,20 +1,28 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-preview.3.21202.5" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
+    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-preview.5.21255.8" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
       <Uri>https://github.com/dotnet/installer</Uri>
-      <Sha>aee38a6dd446b512b1ae510d80d2ed1c1f24e79a</Sha>
+      <Sha>8e4d77c38be0f061f14c166a4bdc1bbbfa6a2073</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Android.Sdk.Windows" Version="11.0.200-preview.3.196">
+    <Dependency Name="Microsoft.Android.Sdk.Windows" Version="11.0.200-ci.main.260">
       <Uri>https://github.com/xamarin/xamarin-android</Uri>
-      <Sha />
+      <Sha>4182e1ff3eb779c499402eb7016fc7de84a0f8f4</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.MacCatalyst.Sdk" Version="14.3.100-preview.3.471">
+    <Dependency Name="Microsoft.MacCatalyst.Sdk" Version="14.5.100-ci.main.803">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha />
+      <Sha>ab14e071461ff773f118112d4e922c421fdc2a80</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.iOS.Sdk" Version="14.4.100-preview.3.1326">
+    <Dependency Name="Microsoft.iOS.Sdk" Version="14.5.100-ci.main.803">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha />
+      <Sha>ab14e071461ff773f118112d4e922c421fdc2a80</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.tvOS.Sdk" Version="14.5.100-ci.main.803">
+      <Uri>https://github.com/xamarin/xamarin-macios</Uri>
+      <Sha>ab14e071461ff773f118112d4e922c421fdc2a80</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.macOS.Sdk" Version="11.3.100-ci.main.803">
+      <Uri>https://github.com/xamarin/xamarin-macios</Uri>
+      <Sha>ab14e071461ff773f118112d4e922c421fdc2a80</Sha>
     </Dependency>
   </ProductDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 3307b1349ba1..86bb0600ce60 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -1,9 +1,15 @@
 <Project>
   <!--Package versions-->
   <PropertyGroup>
-    <MicrosoftDotnetSdkInternalPackageVersion>6.0.100-preview.3.21202.5</MicrosoftDotnetSdkInternalPackageVersion>
-    <MicrosoftAndroidSdkWindowsPackageVersion>11.0.200-preview.3.196</MicrosoftAndroidSdkWindowsPackageVersion>
-    <MicrosoftMacCatalystSdkPackageVersion>14.3.100-preview.3.471</MicrosoftMacCatalystSdkPackageVersion>
-    <MicrosoftiOSSdkPackageVersion>14.4.100-preview.3.1326</MicrosoftiOSSdkPackageVersion>
+    <MicrosoftDotnetSdkInternalPackageVersion>6.0.100-preview.5.21255.8</MicrosoftDotnetSdkInternalPackageVersion>
+    <MicrosoftAndroidSdkWindowsPackageVersion>11.0.200-ci.main.260</MicrosoftAndroidSdkWindowsPackageVersion>
+    <MicrosoftMacCatalystSdkPackageVersion>14.5.100-ci.main.803</MicrosoftMacCatalystSdkPackageVersion>
+    <MicrosoftiOSSdkPackageVersion>14.5.100-ci.main.803</MicrosoftiOSSdkPackageVersion>
+    <MicrosofttvOSSdkPackageVersion>14.5.100-ci.main.803</MicrosofttvOSSdkPackageVersion>
+    <MicrosoftmacOSSdkPackageVersion>11.3.100-ci.main.803</MicrosoftmacOSSdkPackageVersion>
+  </PropertyGroup>
+  <PropertyGroup>
+    <!-- Trim all characters after first `-` or `+` is encountered. -->
+    <DotNetPreviewVersionBand Condition=" '$(DotNetPreviewVersionBand)' == '' ">$([System.Text.RegularExpressions.Regex]::Replace($(MicrosoftDotnetSdkInternalPackageVersion), `[-+].*$`, ""))</DotNetPreviewVersionBand>
   </PropertyGroup>
 </Project>
diff --git a/eng/automation/LocProject.json b/eng/automation/LocProject.json
new file mode 100644
index 000000000000..90bf4c21dec0
--- /dev/null
+++ b/eng/automation/LocProject.json
@@ -0,0 +1,23 @@
+{
+    "Projects": [
+      {
+        "LanguageSet": "VS_Main_Languages",
+        "LocItems": [
+            {
+                "SourceFile": "src\\Compatibility\\Core\\src\\iOS\\Resources\\StringResources.resx",
+                "LclFile": "loc\\{Lang}\\src\\Compatibility\\Core\\src\\iOS\\Resources\\StringResources.resx.lcl",
+                "CopyOption": "LangIDOnName",
+                "OutputPath": "src\\Compatibility\\Core\\src\\iOS\\Resources\\"
+            },
+            {
+                "SourceFile": "src\\Controls\\src\\Build.Tasks\\ErrorMessages.resx",
+                "LclFile": "loc\\{Lang}\\src\\Controls\\src\\Build.Tasks\\ErrorMessages.resx.lcl",
+                "CopyOption": "LangIDOnName",
+                "OutputPath": "src\\Controls\\src\\Build.Tasks\\xlf\\"
+            }
+        ],
+        "LssFiles": [],
+        "CloneLanguageSet": ""
+      }
+    ]
+}
\ No newline at end of file
diff --git a/eng/automation/scripts/Invoke-Git.psm1 b/eng/automation/scripts/Invoke-Git.psm1
new file mode 100644
index 000000000000..536163dddace
--- /dev/null
+++ b/eng/automation/scripts/Invoke-Git.psm1
@@ -0,0 +1,34 @@
+<#
+Copyright (c) Microsoft Corporation.  All rights reserved.
+ #>
+<#
+.SYNOPSIS
+Module for invoking git in a safe way that allows for stderr to be written to stdout.
+#>
+function Invoke-Git {
+    <#
+    .Synopsis
+    Wrapper function that deals with Powershell's peculiar error output when Git uses the error stream.
+    .Example
+    Invoke-Git ThrowError
+    $LASTEXITCODE
+    #>
+    [CmdletBinding()]
+    param(
+        [parameter(ValueFromRemainingArguments=$true)]
+        [string[]]$Arguments
+    )
+    & {
+        [CmdletBinding()]
+        param(
+            [parameter(ValueFromRemainingArguments=$true)]
+            [string[]]$InnerArgs
+        )
+        git.exe $InnerArgs
+    } -ErrorAction SilentlyContinue -ErrorVariable fail @Arguments
+    if ($fail) {
+        $fail.Exception
+    }
+}
+#Exports
+Export-ModuleMember -Function Invoke-Git
\ No newline at end of file
diff --git a/eng/cake/.gitignore b/eng/cake/.gitignore
new file mode 100644
index 000000000000..c50f923c7b31
--- /dev/null
+++ b/eng/cake/.gitignore
@@ -0,0 +1 @@
+tools/
diff --git a/eng/cake/dotnet.cake b/eng/cake/dotnet.cake
new file mode 100644
index 000000000000..19a50e6f1da8
--- /dev/null
+++ b/eng/cake/dotnet.cake
@@ -0,0 +1,223 @@
+// Contains .NET 6-related Cake targets
+
+var ext = IsRunningOnWindows() ? ".exe" : "";
+var dotnetPath = $"./bin/dotnet/dotnet{ext}";
+
+Task("dotnet")
+    .Description("Provisions .NET 6 into bin/dotnet based on eng/Versions.props")
+    .Does(() =>
+    {
+        var binlog = $"artifacts/dotnet-{configuration}.binlog";
+        var settings = new DotNetCoreBuildSettings
+        {
+            MSBuildSettings = new DotNetCoreMSBuildSettings()
+                .EnableBinaryLogger(binlog)
+                .SetConfiguration(configuration),
+        };
+        DotNetCoreBuild("./src/DotNet/DotNet.csproj", settings);
+    });
+
+Task("dotnet-pack")
+    .Description("Build and create .NET 6 NuGet packages")
+    //.IsDependentOn("dotnet")
+   // .IsDependentOn("dotnet-buildtasks")
+    .Does(()=>
+    {
+
+        var settings = new DotNetCoreToolSettings
+        {
+            DiagnosticOutput = true,
+            ArgumentCustomization = args => args.Append($"./eng/package.ps1 -configuration \"{configuration}\"")
+        };
+
+        DotNetCoreTool("pwsh", settings);
+
+        // RunMSBuildWithLocalDotNet("Microsoft.Maui-net6.sln", (settings) =>
+        // {
+        //     if (settings is MSBuildSettings msbuildSettings)
+        //     {
+        //         msbuildSettings
+        //             .WithProperty("Packing", "true")
+        //             .WithProperty("CI", "true")
+        //             .WithTarget("build");
+
+        //     }
+        //     else if( settings is DotNetCoreMSBuildSettings dotnetSettings )
+        //     {
+        //         dotnetSettings
+        //             .WithProperty("Packing", "true")
+        //             .WithProperty("CI", "true")
+        //             .WithTarget("pack");
+
+        //     }
+        // });
+
+
+        // if (IsRunningOnWindows())
+        // {        
+        //     RunMSBuildWithLocalDotNet("Microsoft.Maui-net6.sln", (settings) =>
+        //     {
+        //         if (settings is MSBuildSettings msbuildSettings)
+        //         {
+        //             msbuildSettings
+        //                 .WithProperty("Packing", "true")
+        //                 .WithProperty("CI", "true")
+        //                 .WithTarget("pack");
+
+        //         }
+        //     });
+        // }
+    });
+
+Task("dotnet-buildtasks")
+    .IsDependentOn("dotnet")
+    .Does(() =>
+    {
+        RunMSBuildWithLocalDotNet("./Microsoft.Maui.BuildTasks-net6.sln");
+    });
+
+Task("VS-DOGFOOD")
+    .Description("Provisions .NET 6 and launches an instance of Visual Studio using it.")
+    .IsDependentOn("dotnet")
+    .Does(() =>
+    {
+        StartVisualStudioForDotNet6(null);
+    });
+
+Task("VS-NET6")
+    .Description("Provisions .NET 6 and launches an instance of Visual Studio using it.")
+    .IsDependentOn("Clean")
+    .IsDependentOn("dotnet")
+    .IsDependentOn("dotnet-buildtasks")
+    .Does(() =>
+    {
+        StartVisualStudioForDotNet6();
+    });
+
+Task("VS-WINUI")
+    .Description("Provisions .NET 6 and launches an instance of Visual Studio with WinUI projects.")
+    .IsDependentOn("Clean")
+    .IsDependentOn("dotnet")
+    .IsDependentOn("dotnet-buildtasks")
+    .Does(() =>
+    {
+        RunMSBuildWithLocalDotNet("./Microsoft.Maui.WinUI.sln");
+        StartVisualStudioForDotNet6("./Microsoft.Maui.WinUI.sln");
+    });
+
+Task("VS-ANDROID")
+    .Description("Provisions .NET 6 and launches an instance of Visual Studio with Android projects.")
+    .IsDependentOn("Clean")
+    .IsDependentOn("dotnet")
+    .IsDependentOn("dotnet-buildtasks")
+    .Does(() =>
+    {
+        DotNetCoreRestore("./Microsoft.Maui-net6.sln", new DotNetCoreRestoreSettings
+        {
+            ToolPath = dotnetPath
+        });
+
+        StartVisualStudioForDotNet6("./Microsoft.Maui.Droid.sln");
+    });
+
+string FindMSBuild()
+{
+    if (IsRunningOnWindows())
+    {
+        var vsInstallation = VSWhereLatest(new VSWhereLatestSettings { Requires = "Microsoft.Component.MSBuild", IncludePrerelease = true });
+        if (vsInstallation != null)
+        {
+            var path = vsInstallation.CombineWithFilePath(@"MSBuild\Current\Bin\MSBuild.exe");
+            if (FileExists(path))
+                return path.FullPath;
+            
+            path = vsInstallation.CombineWithFilePath(@"MSBuild\15.0\Bin\MSBuild.exe");
+            if (FileExists(path))
+                return path.FullPath;
+        }
+    }
+    return "msbuild";
+}
+
+void SetDotNetEnvironmentVariables()
+{
+    var dotnet = MakeAbsolute(Directory("./bin/dotnet/")).ToString();
+    var target = EnvironmentVariableTarget.Process;
+    Environment.SetEnvironmentVariable("DOTNET_INSTALL_DIR", dotnet, target);
+    Environment.SetEnvironmentVariable("DOTNET_ROOT", dotnet, target);
+    Environment.SetEnvironmentVariable("DOTNET_MSBUILD_SDK_RESOLVER_CLI_DIR", dotnet, target);
+    Environment.SetEnvironmentVariable("DOTNET_MULTILEVEL_LOOKUP", "0", target);
+    Environment.SetEnvironmentVariable("MSBuildEnableWorkloadResolver", "true", target);
+    Environment.SetEnvironmentVariable("PATH", dotnet + System.IO.Path.PathSeparator + EnvironmentVariable("PATH"), target);
+}
+
+void StartVisualStudioForDotNet6(string sln = "./Microsoft.Maui-net6.sln")
+{
+    if (isCIBuild)
+    {
+        Information("This target should not run on CI.");
+        return;
+    }
+    if (!IsRunningOnWindows())
+    {
+        Information("This target is only supported on Windows.");
+        return;
+    }
+
+    var vsLatest = VSWhereLatest(new VSWhereLatestSettings { IncludePrerelease = true, });
+    if (vsLatest == null)
+        throw new Exception("Unable to find Visual Studio!");
+    SetDotNetEnvironmentVariables();
+    Environment.SetEnvironmentVariable("_ExcludeMauiProjectCapability", "true", EnvironmentVariableTarget.Process);
+    StartProcess(vsLatest.CombineWithFilePath("./Common7/IDE/devenv.exe"), sln);
+}
+
+// NOTE: this method works as long as the DotNet target has already run
+void RunMSBuildWithLocalDotNet(string sln, Action<object> settings = null)
+{
+    var name = System.IO.Path.GetFileNameWithoutExtension(sln);
+    var binlog = $"artifacts/{name}-{configuration}.binlog";
+
+    // If we're not on Windows, just use ./bin/dotnet/dotnet, that's it
+    if (!IsRunningOnWindows())
+    {
+        var dotnetBuildSettings = new DotNetCoreMSBuildSettings
+        {
+            BinaryLogger = new MSBuildBinaryLoggerSettings
+            {
+                Enabled = true,
+                FileName = binlog,
+            },
+        };
+
+        settings?.Invoke(dotnetBuildSettings);
+        
+        DotNetCoreBuild(sln,
+            new DotNetCoreBuildSettings
+            {
+                Configuration = configuration,
+                ToolPath = dotnetPath,
+                MSBuildSettings = dotnetBuildSettings,
+            });
+        return;
+    }
+
+    // Otherwise we need to set env variables and run MSBuild
+    SetDotNetEnvironmentVariables();
+    var msbuildSettings = new MSBuildSettings
+        {
+            Configuration = configuration,
+            BinaryLogger = new MSBuildBinaryLogSettings
+            {
+                Enabled  = true,
+                FileName = binlog,
+            },
+            ToolPath = FindMSBuild(),
+        };
+
+    settings?.Invoke(msbuildSettings);
+
+    MSBuild(sln,
+       msbuildSettings
+       .WithRestore());
+}
diff --git a/eng/cake/helpers.cake b/eng/cake/helpers.cake
new file mode 100644
index 000000000000..aa74e0e11f67
--- /dev/null
+++ b/eng/cake/helpers.cake
@@ -0,0 +1,31 @@
+Task("Clean")
+    .Description("Deletes all the obj/bin directories")
+    .Does(() =>
+{
+    List<string> foldersToClean = new List<string>();
+
+    foreach (var item in new [] {"obj", "bin"})
+    {
+        foreach(string f in System.IO.Directory.GetDirectories(".", item, SearchOption.AllDirectories))
+        {
+            if(f.StartsWith(@".\bin") || f.StartsWith(@".\tools"))
+                continue;
+
+            // this is here as a safety check
+            if(!f.StartsWith(@".\src"))
+                continue;
+
+            CleanDirectories(f);
+        }        
+    } 
+});
+
+
+
+T GetBuildVariable<T>(string key, T defaultValue)
+{
+    // on MAC all environment variables are upper case regardless of how you specify them in devops
+    // And then Environment Variable check is case sensitive
+    T upperCaseReturnValue = Argument(key.ToUpper(), EnvironmentVariable(key.ToUpper(), defaultValue));
+    return Argument(key, EnvironmentVariable(key, upperCaseReturnValue));
+}
\ No newline at end of file
diff --git a/eng/dogfood.ps1 b/eng/dogfood.ps1
deleted file mode 100644
index 0d4ce1fbdc2e..000000000000
--- a/eng/dogfood.ps1
+++ /dev/null
@@ -1,119 +0,0 @@
-<#
-  .SYNOPSIS
-  *Windows-only* Launches Visual Studio with environment variables to use the local ./bin/dotnet/dotnet.exe.
-
-  .DESCRIPTION
-  *Windows-only* Launches Visual Studio with environment variables to use the local ./bin/dotnet/dotnet.exe.
-  Script based on:
-  https://github.com/dotnet/runtime/blob/1be117d8e7c0cd29ebc55cbcff2a7fa70604ed39/eng/build.ps1#L186-L208
-  https://github.com/dotnet/runtime/blob/1be117d8e7c0cd29ebc55cbcff2a7fa70604ed39/eng/common/tools.ps1#L109
-
-  .PARAMETER vs
-  The path to Visual Studio or the edition (Community, Enterprise, Preview), defaults to: "Enterprise".
-
-  .PARAMETER sln
-  The path to a .sln or .project file, defaults to "Microsoft.Maui-net6.sln".
-
-  .PARAMETER modify
-  Modify the environment variables in the current session. This would
-  allow the "dotnet" command to work instead of ".\bin\dotnet\dotnet".
-  However, it would be good to do this in a new terminal session,
-  since you would have trouble running "dotnet build" if it needs to
-  provision .NET 6 and the iOS/Android workloads again.
-
-  .EXAMPLE
-  PS> .\scripts\dogfood.ps1
-
-  .EXAMPLE
-  PS> .\scripts\dogfood.ps1 -vs "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\devenv.exe"
-
-  .EXAMPLE
-  PS> .\scripts\dogfood.ps1 -vs "Preview"
-
-  .EXAMPLE
-  PS> .\scripts\dogfood.ps1 -sln .\path\to\MySolution.sln
-#>
-
-param(
-  [string]$vs = "Enterprise",
-  [string]$sln,
-  [switch]$modify,
-  [switch]$JustCreateGlobalJSON
-)
-
-if ($vs.Contains("\") -Or $vs.Contains("/")) {
-    $realVS = $vs
-} else {
-    $realVS = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2019\$vs\Common7\IDE\devenv.exe"
-}
-
-$dotnet=Join-Path $PSScriptRoot ../bin/dotnet/
-$dotnet=(Get-Item $dotnet).FullName
-
-if (-Not $sln) {
-    $sln=Join-Path $PSScriptRoot ../Microsoft.Maui-net6.sln
-    $sln=(Get-Item $sln).FullName
-}
-
-# Modify global.json, so the IDE can load
-$globaljson = Join-Path $PSScriptRoot ../global.json
-[xml] $xml = Get-Content (Join-Path $PSScriptRoot Versions.props)
-$json = Get-Content $globaljson | ConvertFrom-Json
-$json | Add-Member sdk (New-Object -TypeName PSObject) -Force
-$json.sdk | Add-Member version $xml.Project.PropertyGroup.MicrosoftDotnetSdkInternalPackageVersion -Force
-$json | ConvertTo-Json | Set-Content $globaljson
-
-# NOTE: I've not found a better way to do this
-# see: https://github.com/PowerShell/PowerShell/issues/3316
-$oldDOTNET_INSTALL_DIR=$env:DOTNET_INSTALL_DIR
-$oldDOTNET_ROOT=$env:DOTNET_ROOT
-$oldDOTNET_MSBUILD_SDK_RESOLVER_CLI_DIR=$env:DOTNET_MSBUILD_SDK_RESOLVER_CLI_DIR
-$oldDOTNET_MULTILEVEL_LOOKUP=$env:DOTNET_MULTILEVEL_LOOKUP
-$oldMSBuildEnableWorkloadResolver=$env:MSBuildEnableWorkloadResolver
-$old_ExcludeMauiProjectCapability=$env:_ExcludeMauiProjectCapability
-# $old_MSBuildDisableNodeReuse=$env:MSBuildDisableNodeReuse
-$oldPATH=$env:PATH
-
-try {
-    $env:DOTNET_INSTALL_DIR=$dotnet
-
-    # This tells .NET to use the bootstrapped runtime
-    $env:DOTNET_ROOT=$env:DOTNET_INSTALL_DIR
-
-    # This tells MSBuild to load the SDK from the directory of the bootstrapped SDK
-    $env:DOTNET_MSBUILD_SDK_RESOLVER_CLI_DIR=$env:DOTNET_ROOT
-
-    # This tells .NET not to go looking for .NET in other places
-    $env:DOTNET_MULTILEVEL_LOOKUP=0
-
-    # This enables workload support inside the IDE
-    $env:MSBuildEnableWorkloadResolver=$true
-
-    # This disables the Maui @(ProjectCapability), a temporary workaround for 16.9
-    $env:_ExcludeMauiProjectCapability=$true
-
-    # # This tells MSBuild not to keep the process around
-    # $env:MSBuildDisableNodeReuse=1
-
-    # Put our local dotnet.exe on PATH first so Visual Studio knows which one to use
-    $env:PATH=($env:DOTNET_ROOT + ";" + $env:PATH)
-
-    if(-Not $JustCreateGlobalJSON)
-    {
-        # Launch VS
-        & "$realVS" "$sln"
-    }
-} finally {
-    if (-Not $modify) {
-        $env:DOTNET_INSTALL_DIR = $oldDOTNET_INSTALL_DIR
-        $env:DOTNET_ROOT=$oldDOTNET_ROOT
-        $env:DOTNET_MSBUILD_SDK_RESOLVER_CLI_DIR=$oldDOTNET_MSBUILD_SDK_RESOLVER_CLI_DIR
-        $env:DOTNET_MULTILEVEL_LOOKUP=$oldDOTNET_MULTILEVEL_LOOKUP
-        $env:MSBuildEnableWorkloadResolver=$oldMSBuildEnableWorkloadResolver
-        $env:_ExcludeMauiProjectCapability=$old_ExcludeMauiProjectCapability
-        # $env:MSBuildDisableNodeReuse=$oldMSBuildDisableNodeReuse
-        $env:PATH=$oldPATH
-    }
-}
-
-exit 0
\ No newline at end of file
diff --git a/eng/package.ps1 b/eng/package.ps1
index 7ae0e486f611..d0d37ee11fdd 100644
--- a/eng/package.ps1
+++ b/eng/package.ps1
@@ -1,10 +1,14 @@
 param(
   [string] $configuration = 'Debug',
-  [string] $msbuild = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\MSBuild.exe"
+  [string] $msbuild = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2019\Preview\MSBuild\Current\Bin\MSBuild.exe"
 )
 
+$ErrorActionPreference = "Stop"
+Write-Host $msbuild
+
 $artifacts = Join-Path $PSScriptRoot ../artifacts
 $sln = Join-Path $PSScriptRoot ../Microsoft.Maui-net6.sln
+$slnTasks = Join-Path $PSScriptRoot ../Microsoft.Maui.BuildTasks-net6.sln
 
 # Bootstrap .\bin\dotnet\
 $csproj = Join-Path $PSScriptRoot ../src/DotNet/DotNet.csproj
@@ -50,6 +54,14 @@ if ($IsWindows)
         # Put our local dotnet.exe on PATH first so Visual Studio knows which one to use
         $env:PATH=($env:DOTNET_ROOT + ";" + $env:PATH)
 
+        # Have to build the solution tasks
+        & $msbuild $slnTasks `
+            /p:configuration=$configuration `
+            /p:SymbolPackageFormat=snupkg `
+            /restore `
+            /t:build `
+            /bl:"$artifacts/maui-build-tasks-$configuration.binlog"
+
         # Have to build the solution first so the xbf files are there for pack
         & $msbuild $sln `
             /p:configuration=$configuration `
@@ -58,6 +70,7 @@ if ($IsWindows)
             /t:build `
             /p:Packing=true `
             /bl:"$artifacts/maui-build-$configuration.binlog"
+        if (!$?) { throw "Build failed." }
 
         & $msbuild $sln `
             /p:configuration=$configuration `
@@ -65,6 +78,7 @@ if ($IsWindows)
             /t:pack `
             /p:Packing=true `
             /bl:"$artifacts/maui-pack-$configuration.binlog"
+        if (!$?) { throw "Pack failed." }
     }
     finally
     {
@@ -86,4 +100,5 @@ else
         -c:$configuration `
         -p:SymbolPackageFormat=snupkg `
         -bl:$artifacts/maui-pack-$configuration.binlog
-}
\ No newline at end of file
+    if (!$?) { throw "Pack failed." }
+}
diff --git a/eng/pipelines/common/build-windows.yml b/eng/pipelines/common/build-windows.yml
index ffe67b6f271a..f297972d2841 100644
--- a/eng/pipelines/common/build-windows.yml
+++ b/eng/pipelines/common/build-windows.yml
@@ -36,7 +36,7 @@ steps:
     inputs:
       script: 'nuget install NUnit3TestAdapter'
 
-  - script: build.cmd -Target BuildForNuget -ScriptArgs '--BUILD_CONFIGURATION="$(BuildConfiguration)"','--Build_ArtifactStagingDirectory="$(Build.ArtifactStagingDirectory)"'
+  - script: build.cmd -Target BuildUnitTests -ScriptArgs '--configuration="$(BuildConfiguration)"','--Build_ArtifactStagingDirectory="$(Build.ArtifactStagingDirectory)"'
     name: winbuild
     displayName: 'Build Projects For Nuget'
 
diff --git a/eng/pipelines/common/controlgallery-android.yml b/eng/pipelines/common/controlgallery-android.yml
index 5d2dde3c54be..71227846b08c 100644
--- a/eng/pipelines/common/controlgallery-android.yml
+++ b/eng/pipelines/common/controlgallery-android.yml
@@ -32,14 +32,14 @@ steps:
     inputs:
       targetType: 'filePath'
       filePath: 'build.sh'
-      arguments: --target cg-android --ANDROID_RENDERERS="$(renderers)" --GoogleMapsAPIKey="$(GoogleMapsAPIKey)" --BUILD_CONFIGURATION=$(BuildConfiguration)
+      arguments: --target cg-android --ANDROID_RENDERERS="$(renderers)" --GoogleMapsAPIKey="$(GoogleMapsAPIKey)" --configuration=$(BuildConfiguration)
 
   - task: Bash@3
     displayName: 'Build Android UITests'
     inputs:
       targetType: 'filePath'
       filePath: 'build.sh'
-      arguments: --target cg-android-build-tests --BUILD_CONFIGURATION=$(BuildConfiguration)
+      arguments: --target cg-android-build-tests --configuration=$(BuildConfiguration)
 
   - task: CopyFiles@2
     displayName: 'Copy Android Files for UITest'
diff --git a/eng/pipelines/common/controlgallery-ios.yml b/eng/pipelines/common/controlgallery-ios.yml
index 125d41b9fce5..0f6e2d6a9d0e 100644
--- a/eng/pipelines/common/controlgallery-ios.yml
+++ b/eng/pipelines/common/controlgallery-ios.yml
@@ -52,14 +52,14 @@ steps:
     inputs:
       targetType: 'filePath'
       filePath: 'build.sh'
-      arguments: --target cg-ios --BUILD_CONFIGURATION=$(BuildConfiguration)
+      arguments: --target cg-ios --configuration=$(BuildConfiguration)
 
   - task: Bash@3
     displayName: 'Build iOS UITests Tests'
     inputs:
       targetType: 'filePath'
       filePath: 'build.sh'
-      arguments: --target cg-ios-build-tests --BUILD_CONFIGURATION=$(BuildConfiguration)
+      arguments: --target cg-ios-build-tests --configuration=$(BuildConfiguration)
 
   - task: CopyFiles@2
     displayName: 'Copy iOS Files for UITest'
diff --git a/eng/pipelines/common/controlgallery-windows.yml b/eng/pipelines/common/controlgallery-windows.yml
new file mode 100644
index 000000000000..c7cc08578b3e
--- /dev/null
+++ b/eng/pipelines/common/controlgallery-windows.yml
@@ -0,0 +1,25 @@
+steps:
+  - checkout: self
+    clean: true
+
+  - task: xamops.azdevex.provisionator-task.provisionator@1
+    displayName: 'Provisionator'
+    condition: eq(variables['provisioning'], 'true')
+    inputs:
+      provisioning_script: $(provisionator.path)
+      provisioning_extra_args: $(provisionator.extraArguments)
+
+  - powershell: |
+      $(System.DefaultWorkingDirectory)/build.ps1 --target provision --TeamProject="$(System.TeamProject)"
+    displayName: 'Cake Provision'
+    condition: eq(variables['provisioningCake'], 'true')
+
+  - powershell: |
+      $(System.DefaultWorkingDirectory)/build.ps1 --target VS-WINUI --TeamProject="$(System.TeamProject)"
+    displayName: 'Build WinUI Solution'
+  
+  - task: PublishBuildArtifacts@1
+    displayName: 'Publish Artifact: ${{ parameters.artifactsName }}'
+    condition: always()
+    inputs:
+      ArtifactName: WINUI
diff --git a/eng/pipelines/common/device-tests-steps.yml b/eng/pipelines/common/device-tests-steps.yml
index 4abd1f769497..35dbfe2ae121 100644
--- a/eng/pipelines/common/device-tests-steps.yml
+++ b/eng/pipelines/common/device-tests-steps.yml
@@ -51,7 +51,7 @@ steps:
       packageType: 'sdk'
 
   - pwsh: |
-      ./build.ps1 --target=BuildTasks --BUILD_CONFIGURATION=Debug --Build_ArtifactStagingDirectory="$(Build.ArtifactStagingDirectory)"
+      ./build.ps1 --target=BuildTasks --configuration=Debug --Build_ArtifactStagingDirectory="$(Build.ArtifactStagingDirectory)"
     name: winbuild
     displayName: 'Build the MSBuild Tasks'
 
diff --git a/eng/pipelines/common/localization-handback.yml b/eng/pipelines/common/localization-handback.yml
new file mode 100644
index 000000000000..38289e8bb571
--- /dev/null
+++ b/eng/pipelines/common/localization-handback.yml
@@ -0,0 +1,84 @@
+
+stages:
+  - stage: localization_handback
+    displayName: Localization Handback
+    dependsOn: []
+    condition: and(succeeded(), eq(variables.isLocBranch, true))
+
+    jobs:
+      - job : generate_resx
+        displayName: 'Process incoming translations'
+        pool:  $(HostedWinVS2019)
+        steps:
+          - checkout: self
+            persistCredentials: true
+            clean: true
+
+          - powershell: |
+              #-- Import Invoke-Git Module function
+              Import-Module $(Build.SourcesDirectory)\eng\automation\scripts\Invoke-Git.psm1 -Force -DisableNameChecking
+              git config user.email "vs-mobiletools-engineering-service2@microsoft.com"
+              git config user.name "VS Mobile Engineering Serice Account"
+              Invoke-Git checkout main
+              Invoke-Git merge origin/$(LocBranch) --no-commit
+            displayName: 'Merge loc Branch'
+
+          - task: cesve.one-loc-build.one-loc-build.OneLocBuild@2
+            displayName: 'Localization Build'
+            env:
+              SYSTEM_ACCESSTOKEN: $(System.AccessToken) 
+            inputs:
+              locProj: 'eng/automation/LocProject.json'
+              outDir: '$(Build.ArtifactStagingDirectory)'
+              packageSourceAuth: patAuth
+              patVariable: "$(OneLocBuildPAT)"
+              isCreatePrSelected: false
+              repoType: gitHub
+              prSourceBranchPrefix: $(LocBranchPrefix)
+              gitHubPatVariable: '$(GitHub.Token)'
+              gitHubPrMergeMethod: merge
+
+          - powershell: |
+              #-- Import Invoke-Git Module function
+              Import-Module $(Build.SourcesDirectory)\eng\automation\scripts\Invoke-Git.psm1 -Force -DisableNameChecking
+              #--Clear Stage
+              Invoke-Git reset HEAD -- .
+              #-- Create new branch
+              $branchName = "$(LocBranchPrefix)/$(new-guid)"
+              Invoke-Git checkout -B ${branchName}
+              Write-Host ("##vso[task.setvariable variable=HANDBACK_BRANCH_NAME;]$branchName")
+              #-- Stage Build Changes
+              Invoke-Git add src
+              #-- Only commit/push if there are changed files.
+              $changedFiles = $(git status --porcelain | Measure-Object | Select-Object -expand Count)
+              if ($changedFiles -gt 0)
+              {
+                #-- Commit Changes locally
+                Invoke-Git commit -m "[LOC_HB] string translations" --no-verify
+                #-- Push changes to VSTS
+                Invoke-Git push origin HEAD:${branchName}
+              }
+            displayName: 'Commit updates'
+
+          - powershell: |
+              $payload=@{
+                title = "[LOC_HB] checkin of localized string files"
+                head = "$(HANDBACK_BRANCH_NAME)"
+                base = "main"
+                maintainer_can_modify = $true
+              }
+
+              $headers = @{ Authorization = "token $(GitHub.Token)" }
+
+              # let it throw
+              $response = Invoke-WebRequest -UseBasicParsing -Method POST -Headers $headers -Uri "https://api.github.com/repos/dotnet/maui/pulls" -Body ($payload | ConvertTo-json)
+              $newPr =  $response.Content | ConvertFrom-Json
+
+              Write-Host "Response is $newPr"      
+            displayName: Open Pull Request
+
+          - task: PublishBuildArtifacts@1
+            inputs:
+              PathtoPublish: '$(Build.ArtifactStagingDirectory)'
+              ArtifactName: 'drop'
+              publishLocation: 'Container'
diff --git a/eng/pipelines/common/localization-handoff.yml b/eng/pipelines/common/localization-handoff.yml
new file mode 100644
index 000000000000..c026de5a823b
--- /dev/null
+++ b/eng/pipelines/common/localization-handoff.yml
@@ -0,0 +1,27 @@
+stages:
+  - stage: localization_handoff
+    displayName: Localization Handoff
+    dependsOn: []
+    condition: and(succeeded(), eq(variables.isMainBranch, true))
+
+    jobs:
+      - job : generate_lci
+        displayName: 'Process outgoing strings'
+        pool:  $(HostedWinVS2019)
+        steps:
+
+          - task: cesve.one-loc-build.one-loc-build.OneLocBuild@2
+            displayName: 'Localization Build'
+            env:
+              SYSTEM_ACCESSTOKEN: $(System.AccessToken) 
+            inputs:
+              locProj: 'eng/automation/LocProject.json'
+              outDir: '$(Build.ArtifactStagingDirectory)'
+              packageSourceAuth: patAuth
+              patVariable: "$(OneLocBuildPAT)"
+
+          - task: PublishBuildArtifacts@1
+            inputs:
+              PathtoPublish: '$(Build.ArtifactStagingDirectory)'
+              ArtifactName: 'drop'
+              publishLocation: 'Container'
\ No newline at end of file
diff --git a/eng/pipelines/common/merge-translations-update.yml b/eng/pipelines/common/merge-translations-update.yml
new file mode 100644
index 000000000000..fd5b4944548d
--- /dev/null
+++ b/eng/pipelines/common/merge-translations-update.yml
@@ -0,0 +1,37 @@
+stages:
+  - stage: merge_translations_updates
+    displayName: 'Merge Translations Updates'
+    dependsOn: []
+    condition: and( succeeded(), and( eq(variables.isTargetMainBranch, true), variables.isLocPRBranch ) ) 
+
+    jobs:
+      - job : validate_merge
+        displayName: 'Validate and Merge Translations'
+        pool:
+          name: XamarinForms
+        variables:
+          pull_request_number: $(System.PullRequest.PullRequestNumber)
+        workspace:
+          clean: all
+
+        steps:
+          - powershell: |
+              Write-Host "Validating translations for PR# $(System.PullRequest.PullRequestNumber)"
+              $srcDir = "$(Build.SourcesDirectory)/maui"
+              $matches = Select-String -Path "$srcDir/**/*.resx" -Pattern '\[.*\]\s\(https:.*\)' -AllMatches
+              $matchCount = ($matches | Measure-Object -Line).Lines
+              Write-Host "Found $matchCount violations."
+              $matches | Write-Host
+              if( ($matches | Measure-Object -Line).Lines -eq 0 ) {
+                Write-Host "Quality Gate Succeeded."
+              } else {
+                throw "Quality Gate Failure : Check the logs for details."
+              }
+            displayName: 'Validate Markdown Urls'
+          - task: github-merge-pr@1
+            inputs:
+              github_token: $(GitHub.Token)
+              repository: 'dotnet/maui'
+              pr_number: $(pull_request_number)
+              merge_method: 'rebase'
+            displayName: Merge PR# $(System.PullRequest.PullRequestNumber)
diff --git a/eng/pipelines/common/security_compliance.yml b/eng/pipelines/common/security_compliance.yml
new file mode 100644
index 000000000000..efb7a190b2b8
--- /dev/null
+++ b/eng/pipelines/common/security_compliance.yml
@@ -0,0 +1,43 @@
+stages:
+  - stage: security_compliance
+    displayName: Security and Compliance checks
+    jobs:
+    - job: run_policheck_security_compliance
+      displayName: 'Policheck And Credentials Compliance'
+      pool: $(HostedWinVS2019)
+      timeoutInMinutes: 60
+      cancelTimeoutInMinutes: 5
+      steps:
+      - checkout: self
+
+      - template: security/policheck/v1.yml@xamarin-templates
+
+      - template: security/xa-static-analysis/v2.yml@xamarin-templates
+        parameters:
+          credScanSuppressionsFile: $(System.DefaultWorkingDirectory)\eng\automation\CredScanSuppressions.json
+
+      - task: securedevelopmentteam.vss-secure-development-tools.build-task-antimalware.AntiMalware@3
+        displayName: Run AntiMalware (Defender) Scan
+        condition: succeededOrFailed()
+        inputs:
+          FileDirPath: $(System.DefaultWorkingDirectory)
+          EnableServices: true
+
+      - task: securedevelopmentteam.vss-secure-development-tools.build-task-report.SdtReport@1
+        displayName: Create Security Analysis Report
+        condition: succeededOrFailed()
+        inputs:
+          AllTools: true
+
+      - task: securedevelopmentteam.vss-secure-development-tools.build-task-publishsecurityanalysislogs.PublishSecurityAnalysisLogs@2
+        displayName: Publish Security Analysis Logs
+        condition: succeededOrFailed()
+        inputs:
+          ArtifactName: CodeAnalysisLogs
+        
+      - task: securedevelopmentteam.vss-secure-development-tools.build-task-postanalysis.PostAnalysis@1
+        displayName: Fail Job if Security Issues are Detected
+        condition: succeededOrFailed()
+        inputs:
+          AllTools: true
+        
diff --git a/eng/pipelines/common/variables.yml b/eng/pipelines/common/variables.yml
index 6008d82e3648..2c22bf731cc5 100644
--- a/eng/pipelines/common/variables.yml
+++ b/eng/pipelines/common/variables.yml
@@ -6,4 +6,35 @@ variables:
 - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
   value: true
 - name: DOTNET_VERSION
-  value: 5.0.102
\ No newline at end of file
+  value: 5.0.201
+- name: LocBranchPrefix
+  value: 'loc-hb'
+- name: LocBranch
+  value: 'loc'
+- name: isMainBranch
+  value: $[eq(variables['Build.SourceBranch'], 'refs/heads/main')]
+- name: isLocBranch
+  value: $[eq(variables['Build.SourceBranch'], 'refs/heads/loc')]
+- name: isTargetMainBranch
+  value: $[eq(variables['System.PullRequest.TargetBranch'], 'refs/heads/main')]
+- name: isTargetLocBranch
+  value: $[eq(variables['System.PullRequest.TargetBranch'], 'refs/heads/loc')]
+- name: isLocPRBranch
+  value: $[startsWith(variables['System.PullRequest.SourceBranch'], 'loc-hb')]
+- name: isPullRequest
+  value: $[eq(variables['Build.Reason'], 'PullRequest')]
+# Common Agent Pools in use
+- name: HostedWinVS2019
+  value: Hosted Windows 2019 with VS2019 
+- name: LogDirectory
+  value: $(Build.ArtifactStagingDirectory)/logs
+- name: provisionator.xcode
+  value: '$(System.DefaultWorkingDirectory)/eng/provisioning/xcode.csx'
+- name: provisionator.path
+  value: '$(System.DefaultWorkingDirectory)/eng/provisioning/provisioning.csx'
+- name: provisionator.vs2019
+  value: '$(System.DefaultWorkingDirectory)/eng/provisioning/vs2019.csx'
+- name: provisionator.extraArguments
+  value: '--v'
+- name: DotNet.Path
+  value: $(System.DefaultWorkingDirectory)/bin/dotnet/dotnet
diff --git a/eng/pipelines/handlers.yml b/eng/pipelines/handlers.yml
index 309ab8bea072..7d646fc460e9 100644
--- a/eng/pipelines/handlers.yml
+++ b/eng/pipelines/handlers.yml
@@ -2,6 +2,8 @@ trigger:
   branches:
     include:
     - main
+    - release/*
+    - loc
   tags:
     include:
     - '*'
@@ -23,6 +25,7 @@ pr:
   branches:
     include:
     - main
+    - release/*
   paths:
     include:
     - '*'
@@ -46,16 +49,6 @@ schedules:
 
 variables:
   - template: /eng/pipelines/common/variables.yml
-  - name: LogDirectory
-    value: $(Build.ArtifactStagingDirectory)/logs
-  - name: provisionator.xcode
-    value: '$(System.DefaultWorkingDirectory)/eng/provisioning/xcode.csx'
-  - name: provisionator.path
-    value: '$(System.DefaultWorkingDirectory)/eng/provisioning/provisioning.csx'
-  - name: provisionator.extraArguments
-    value: '--v'
-  - name: DotNet.Path
-    value: $(System.DefaultWorkingDirectory)/bin/dotnet/dotnet
 
 parameters:
   - name: BuildEverything
@@ -129,6 +122,27 @@ stages:
           steps:
             - template: common/build-windows.yml
 
+  # - stage: windows_controlgallery
+  #   displayName: Build Windows ControlGallery
+  #   dependsOn: []
+  #   jobs:
+  #     - ${{ each BuildCondition in parameters.BuildConfigurations }}:
+  #       - job: win_hosted_${{ BuildCondition }}
+  #         workspace:
+  #           clean: all
+  #         displayName: Build Windows Phase (${{ BuildCondition }})
+  #         condition: or(
+  #           ${{ parameters.BuildEverything }},
+  #           ne(variables['Build.Reason'], 'PullRequest'),
+  #           eq('${{ BuildCondition }}', 'Release'))
+  #         timeoutInMinutes: 60
+  #         pool:
+  #           name: $(vs2019VmPool)
+  #           vmImage: $(vs2019VmImage)
+  #           demands: [ msbuild ]
+  #         steps:
+  #           - template: common/controlgallery-windows.yml
+
   - stage: build_osx
     displayName: iOS
     dependsOn: []
@@ -144,10 +158,6 @@ stages:
           demands:
             - sh
             - Xamarin.iOS
-        variables:
-          provisionator.xcode : '$(System.DefaultWorkingDirectory)/eng/provisioning/xcode.csx'
-          provisionator.path : '$(System.DefaultWorkingDirectory)/eng/provisioning/provisioning.csx'
-          provisionator.extraArguments : '--v'
         steps:
           - template: common/controlgallery-ios.yml
 
@@ -166,9 +176,6 @@ stages:
         variables:
           renderers: 'FAST'
           outputfolder: 'newRenderers'
-          provisionator.xcode : '$(System.DefaultWorkingDirectory)/eng/provisioning/xcode.csx'
-          provisionator.path : '$(System.DefaultWorkingDirectory)/eng/provisioning/provisioning.csx'
-          provisionator.extraArguments : '--v'
         steps:
           - template: common/controlgallery-android.yml
 
@@ -187,6 +194,25 @@ stages:
             vmImage: ${{ BuildPlatform.vmImage }}
           steps:
             - ${{ if eq(BuildPlatform.name, 'macos') }}:
+              - task: xamops.azdevex.provisionator-task.provisionator@1
+                displayName: 'Provision Xcode'
+                condition: ne(variables['REQUIRED_XCODE'], '')
+                inputs:
+                  provisioning_script: $(provisionator.xcode)
+
+              - task: xamops.azdevex.provisionator-task.provisionator@1
+                displayName: 'Provisionator'
+                condition: eq(variables['provisioning'], 'true')
+                inputs:
+                  provisioning_script: $(provisionator.xcode)
+                  provisioning_extra_args: $(provisionator.extraArguments)
+
+              - script: |
+                  echo "##vso[task.prependpath]/Library/Frameworks/Mono.framework/Versions/Current/Commands/"
+                  echo "##vso[task.prependpath]~/Library/Developer/Xamarin/android-sdk-macosx"
+                displayName: 'Setup SDK Paths'
+                condition: ne(variables['osx2019VmPool'], 'Azure Pipelines')
+
               - bash: |
                   set -x
                   mkdir -p ~/Library/Preferences/Xamarin
@@ -194,9 +220,20 @@ stages:
                   /usr/libexec/PlistBuddy -c "add :AppleSdkRoot string $(dirname $(dirname $(xcode-select -p)))" ~/Library/Preferences/Xamarin/Settings.plist || true
                   cat ~/Library/Preferences/Xamarin/Settings.plist || true
                 displayName: configure vsmac xcode
-            - pwsh: ./eng/package.ps1 -configuration Release
+              
+              - script: echo '##vso[task.setvariable variable=JI_JAVA_HOME]$(JAVA_HOME_11_X64)'
+                displayName: set JI_JAVA_HOME
+
+            - ${{ if eq(BuildPlatform.name, 'windows') }}:
+              - task: xamops.azdevex.provisionator-task.provisionator@1
+                displayName: 'Provision VSWindows'
+                inputs:
+                  provisioning_script: $(provisionator.vs2019)
+
+            - script: dotnet tool restore
+              displayName: install dotnet tools
+            - script: dotnet cake --configuration=Release
               displayName: pack nugets
-              errorActionPreference: stop
             - task: CopyFiles@2
               displayName: 'Copy SignList.xml Files'
               inputs:
@@ -208,6 +245,14 @@ stages:
                   **/SignList.xml
                 TargetFolder: $(build.artifactstagingdirectory)
                 flattenFolders: true
+            - task: CopyFiles@2
+              displayName: 'Copy Bin Log Files'
+              condition: always()
+              inputs:
+                Contents: |
+                  **/*.binlog
+                TargetFolder: $(build.artifactstagingdirectory)
+                flattenFolders: true
             - task: PublishBuildArtifacts@1
               condition: always()
               displayName: publish artifacts
@@ -234,6 +279,25 @@ stages:
               vmImage: ${{ BuildPlatform.vmImage }}
             steps:
               - ${{ if eq(BuildPlatform.name, 'macos') }}:
+                - task: xamops.azdevex.provisionator-task.provisionator@1
+                  displayName: 'Provision Xcode'
+                  condition: ne(variables['REQUIRED_XCODE'], '')
+                  inputs:
+                    provisioning_script: $(provisionator.xcode)
+
+                - task: xamops.azdevex.provisionator-task.provisionator@1
+                  displayName: 'Provisionator'
+                  condition: eq(variables['provisioning'], 'true')
+                  inputs:
+                    provisioning_script: $(provisionator.xcode)
+                    provisioning_extra_args: $(provisionator.extraArguments)
+
+                - script: |
+                    echo "##vso[task.prependpath]/Library/Frameworks/Mono.framework/Versions/Current/Commands/"
+                    echo "##vso[task.prependpath]~/Library/Developer/Xamarin/android-sdk-macosx"
+                  displayName: 'Setup SDK Paths'
+                  condition: ne(variables['osx2019VmPool'], 'Azure Pipelines')
+                
                 - bash: |
                     set -x
                     mkdir -p ~/Library/Preferences/Xamarin
@@ -241,6 +305,15 @@ stages:
                     /usr/libexec/PlistBuddy -c "add :AppleSdkRoot string $(dirname $(dirname $(xcode-select -p)))" ~/Library/Preferences/Xamarin/Settings.plist || true
                     cat ~/Library/Preferences/Xamarin/Settings.plist || true
                   displayName: configure vsmac xcode
+                - script: echo '##vso[task.setvariable variable=JI_JAVA_HOME]$(JAVA_HOME_11_X64)'
+                  displayName: set JI_JAVA_HOME
+              
+              - ${{ if eq(BuildPlatform.name, 'windows') }}:
+                - task: xamops.azdevex.provisionator-task.provisionator@1
+                  displayName: 'Provision VSWindows'
+                  inputs:
+                    provisioning_script: $(provisionator.vs2019)
+
               - pwsh: |
                   & dotnet build src/DotNet/DotNet.csproj -bl:$(LogDirectory)/$(BuildConfiguration)-dotnet.binlog
                   & $(DotNet.Path) build Microsoft.Maui.BuildTasks-net6.sln -c $(BuildConfiguration) -bl:$(LogDirectory)/$(BuildConfiguration)-buildtasks.binlog
@@ -268,18 +341,25 @@ stages:
           android: $(System.DefaultWorkingDirectory)/src/Core/tests/DeviceTests.Android/Core.DeviceTests.Android.csproj
           ios: $(System.DefaultWorkingDirectory)/src/Core/tests/DeviceTests.iOS/Core.DeviceTests.iOS.csproj
 
-  # only sign using the private server
-  - ${{ if eq(variables['System.TeamProject'], 'devdiv') }}:
+          stages:
+  
+  - template: common/security_compliance.yml
+  - template: common/localization-handoff.yml                     # Process outgoing strings [Localization Handoff]
+  - template: common/localization-handback.yml                    # Process incoming translations and Create PR to main [Localization Handback]
+  - template: common/merge-translations-update.yml                # Validating incoming translations strings and merge PR [Localization Handback]
+ 
+  - ${{ if eq(variables['System.TeamProject'], 'devdiv') }}:      # Sign only using the private server
     - stage: nuget_signing
       dependsOn: pack_net6
       displayName: Sign Nuget
       jobs:
         - template: sign-artifacts/jobs/v2.yml@xamarin-templates
           parameters:
+            signType: Real
             teamName: Maui
             usePipelineArtifactTasks: false
             targetFolder: $(Build.ArtifactStagingDirectory)/nuget/signed
             signedArtifactName: nuget
             signedArtifactPath: signed
             displayName: Sign Phase
-            condition: and(succeeded(), ne(variables['signVmImage'], ''), or(eq(variables['Sign'], 'true'), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'],'refs/tags/'))))
+            condition: and(succeeded(), ne(variables['signVmImage'], ''), or(eq(variables['Sign'], 'true'), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), or(startsWith(variables['Build.SourceBranch'],'refs/tags/'),  startsWith(variables['Build.SourceBranch'],'refs/heads/release/') ))))
diff --git a/eng/provisioning/vs2019.csx b/eng/provisioning/vs2019.csx
new file mode 100644
index 000000000000..1bb309184723
--- /dev/null
+++ b/eng/provisioning/vs2019.csx
@@ -0,0 +1,4 @@
+VisualStudio (VisualStudioChannel.Preview, VisualStudioTier.Enterprise, 16, @"%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Preview", true)
+    .Workload (VisualStudioWorkload.ManagedDesktop)
+    .Workload (VisualStudioWorkload.NetCrossPlat)
+    .Workload (VisualStudioWorkload.Universal);
\ No newline at end of file
diff --git a/eng/scripts/generate-docs.ps1 b/eng/scripts/generate-docs.ps1
deleted file mode 100644
index 9364c14b3586..000000000000
--- a/eng/scripts/generate-docs.ps1
+++ /dev/null
@@ -1,164 +0,0 @@
-param(
-    [string]$branch = "master",
-    [string]$token
-)
-
-# Yes, this is ignoring the parameter passed in by VSTS; we don't need the
-# parameter, but we can't remove it until all the active branches don't need it
-$branch = "master"
-
-$mdoc = '..\..\build\tools\mdoc\mdoc.exe'
-$docsUri = "https://$token@github.com/xamarin/Xamarin.Forms-api-docs.git"
-
-function StripNodes {
-    Param($file, $xpaths)
-
-    [xml]$xml = Get-Content $file -Encoding UTF8
-
-    $xpaths | % {
-
-        $node = $xml.SelectSingleNode($_)
-
-        while ($node -ne $null) {
-         $x = $node.ParentNode.RemoveChild($node)
-         $node = $xml.SelectSingleNode($_)
-        }
-
-    }
-
-    $utf8WithoutBom = New-Object System.Text.UTF8Encoding($false)
-    $streamWriter = New-Object System.IO.StreamWriter($file, $false, $utf8WithoutBom)
-
-    $xml.Save($streamWriter)
-    $streamWriter.Close()
-}
-
-function ScrubIndex {
-	Param($indexPath)
-
-	[xml]$index = Get-Content $indexPath -Encoding UTF8
-
-	$nameSpaces = $index.SelectNodes("//Namespace")
-
-	$nameSpaces | % {
-		$folder = $_.Name
-		$types = $_.Type
-
-		$types | % {
-            $typeName = $_.Name
-
-			$path = Join-Path (Get-Location) "docs\$($folder)\$($typeName).xml"
-
-			if(-not (Test-Path $path)) {
-                $selector = "//Namespace[@Name='$($folder)']/Type[@Name='$($typeName)']"
-				$toRemove =  $index.SelectSingleNode($selector)
-
-				if($toRemove -ne $null) {
-					$removed = $toRemove.ParentNode.RemoveChild($toRemove)
-				}
-			}
-		}
-	}
-
-	$index.Save((Join-Path (Get-Location) $indexPath))
-}
-
-pushd ..\..
-
-if(test-path docstemp){ del docstemp -Recurse -Force }
-mkdir docstemp
-pushd docstemp
-
-# Default Language Stuff
-# Clone Xamarin.Forms-api-docs in docstemp\Xamarin.Forms-api-docs
-git clone -qb $branch --single-branch $docsUri
-
-pushd .\Xamarin.Forms-api-docs
-
-# Run mdoc
-& $mdoc export-msxdoc .\docs
-
-# Put the results in the docs folder (where NuGet will find it)
-mv Xamarin.Forms.*.xml ..\..\build\docs -Force
-
-# Return from the default language folder
-popd
-
-# Translations stuff
-
-$translations =
-@{"lang" = "de-de"; "target" = "de"},
-@{"lang" = "es-es"; "target" = "es"},
-@{"lang" = "fr-fr"; "target" = "fr"},
-@{"lang" = "it-it"; "target" = "it"},
-@{"lang" = "ja-jp"; "target" = "ja"},
-@{"lang" = "ko-kr"; "target" = "ko"},
-@{"lang" = "pt-br"; "target" = "pt-BR"},
-@{"lang" = "ru-ru"; "target" = "ru"},
-@{"lang" = "zh-cn"; "target" = "zh-Hans"},
-@{"lang" = "zh-tw"; "target" = "zh-Hant"}
-
-#@{"lang" = "cs-cz"; "target" = "cs"},
-#@{"lang" = "pl-pl"; "target" = "pl"},
-#@{"lang" = "tr-tr"; "target" = "tr"},
-
-$branch = "live"
-
-$translations | % {
-    # Generate the URI for each translated version
-    $translationUri = "https://$token@github.com/xamarin/Xamarin.Forms-api-docs.$($_.lang).git"
-    $translationFolder = ".\Xamarin.Forms-api-docs.$($_.lang)"
-
-    # Clone the translation repo
-    git clone -qb $branch --single-branch $translationUri
-
-    # Go into the language-specific folder
-    pushd $translationFolder\docs
-
-    # Copy everything over the stuff in the default language folder
-    # (So untranslated bits still remain in the default language)
-    copy-item -Path . -Destination ..\..\Xamarin.Forms-api-docs -Recurse -Force
-
-    # Return from the language-specific folder
-    popd
-
-    # Go into the default language folder
-    pushd .\Xamarin.Forms-api-docs
-
-    # Clean up the index so it's not trying to convert missing docs
-    Write-Host "Cleaning up the index for $($_.lang)"
-    ScrubIndex .\docs\index.xml
-
-    Write-Host "Stripping out unused XML for $($_.lang)"
-
-    dir .\docs -R *.xml -Exclude ns-*.xml | Select -ExpandProperty FullName | % {
-
-        $xpaths = "//remarks",
-            "//summary[text()='To be added.']",
-            "//param[text()='To be added.']",
-            "//returns[text()='To be added.']",
-            "//typeparam[text()='To be added.']",
-            "//value[text()='To be added.']",
-            "//related",
-            "//example"
-
-        StripNodes $_ $xpaths
-    }
-
-    # Run mdoc
-    & $mdoc export-msxdoc .\docs
-
-    # And put the results in the language specific folder under docs
-    $dest = "..\..\docs\$($_.target)"
-    mkdir $dest
-    mv Xamarin.Forms.*.xml $dest -Force
-
-    # Return from the default language folder
-    popd
-}
-
-popd
-
-del docstemp -R -Force
-
-popd
\ No newline at end of file
diff --git a/src/BlazorWebView/src/core/Android/AndroidWebKitWebViewManager.cs b/src/BlazorWebView/src/core/Android/AndroidWebKitWebViewManager.cs
index 877ee8deded9..f42161616988 100644
--- a/src/BlazorWebView/src/core/Android/AndroidWebKitWebViewManager.cs
+++ b/src/BlazorWebView/src/core/Android/AndroidWebKitWebViewManager.cs
@@ -1,8 +1,8 @@
-using Android.Webkit;
-using AWebView = Android.Webkit.WebView;
-using Microsoft.Extensions.FileProviders;
-using System;
+using System;
 using System.IO;
+using Android.Webkit;
+using Microsoft.Extensions.FileProviders;
+using AWebView = Android.Webkit.WebView;
 
 namespace Microsoft.AspNetCore.Components.WebView.Maui
 {
diff --git a/src/BlazorWebView/src/core/Android/BlazorWebViewHandler.Android.cs b/src/BlazorWebView/src/core/Android/BlazorWebViewHandler.Android.cs
index 569531f29387..02e53bf703f9 100644
--- a/src/BlazorWebView/src/core/Android/BlazorWebViewHandler.Android.cs
+++ b/src/BlazorWebView/src/core/Android/BlazorWebViewHandler.Android.cs
@@ -1,10 +1,10 @@
-using Android.Webkit;
-using static Android.Views.ViewGroup;
-using AWebView = Android.Webkit.WebView;
+using System;
+using System.Collections.ObjectModel;
+using Android.Webkit;
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Maui.Handlers;
-using System;
-using System.Collections.ObjectModel;
+using static Android.Views.ViewGroup;
+using AWebView = Android.Webkit.WebView;
 using Path = System.IO.Path;
 
 namespace Microsoft.AspNetCore.Components.WebView.Maui
diff --git a/src/BlazorWebView/src/core/Android/WebKitWebViewClient.cs b/src/BlazorWebView/src/core/Android/WebKitWebViewClient.cs
index 4428535f1806..40c6cc674379 100644
--- a/src/BlazorWebView/src/core/Android/WebKitWebViewClient.cs
+++ b/src/BlazorWebView/src/core/Android/WebKitWebViewClient.cs
@@ -1,9 +1,9 @@
-using Android.Runtime;
-using Android.Webkit;
-using AWebView = Android.Webkit.WebView;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using Android.Runtime;
+using Android.Webkit;
+using AWebView = Android.Webkit.WebView;
 
 namespace Microsoft.AspNetCore.Components.WebView.Maui
 {
diff --git a/src/BlazorWebView/src/core/IBlazorWebView.cs b/src/BlazorWebView/src/core/IBlazorWebView.cs
index 8b11403c5b2a..0b4541e58d21 100644
--- a/src/BlazorWebView/src/core/IBlazorWebView.cs
+++ b/src/BlazorWebView/src/core/IBlazorWebView.cs
@@ -1,6 +1,6 @@
-using Microsoft.Maui;
-using System;
+using System;
 using System.Collections.ObjectModel;
+using Microsoft.Maui;
 
 namespace Microsoft.AspNetCore.Components.WebView.Maui
 {
diff --git a/src/BlazorWebView/src/core/MauiDispatcher.cs b/src/BlazorWebView/src/core/MauiDispatcher.cs
index 125063f591a8..7eb6b811161c 100644
--- a/src/BlazorWebView/src/core/MauiDispatcher.cs
+++ b/src/BlazorWebView/src/core/MauiDispatcher.cs
@@ -1,6 +1,6 @@
-using Microsoft.Maui.Controls;
-using System;
+using System;
 using System.Threading.Tasks;
+using Microsoft.Maui.Controls;
 
 namespace Microsoft.AspNetCore.Components.WebView.Maui
 {
diff --git a/src/BlazorWebView/src/core/RootComponent.cs b/src/BlazorWebView/src/core/RootComponent.cs
index 07cf5e6c16b7..92ecada35b7f 100644
--- a/src/BlazorWebView/src/core/RootComponent.cs
+++ b/src/BlazorWebView/src/core/RootComponent.cs
@@ -1,11 +1,11 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNetCore.Components;
-using Microsoft.AspNetCore.Components.WebView;
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.WebView;
 
 namespace Microsoft.AspNetCore.Components.WebView.Maui
 {
diff --git a/src/BlazorWebView/src/core/iOS/BlazorWebViewHandler.iOS.cs b/src/BlazorWebView/src/core/iOS/BlazorWebViewHandler.iOS.cs
index 55fc07bb8c9b..ef2d8a73f741 100644
--- a/src/BlazorWebView/src/core/iOS/BlazorWebViewHandler.iOS.cs
+++ b/src/BlazorWebView/src/core/iOS/BlazorWebViewHandler.iOS.cs
@@ -1,17 +1,17 @@
-using Foundation;
-using UIKit;
-using WebKit;
-using RectangleF = CoreGraphics.CGRect;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using Foundation;
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Maui.Controls;
-using Microsoft.Maui.Handlers;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Handlers;
+using UIKit;
+using WebKit;
+using RectangleF = CoreGraphics.CGRect;
 
 namespace Microsoft.AspNetCore.Components.WebView.Maui
 {
diff --git a/src/Compatibility/ControlGallery/src/Android/FormsAppCompatActivity.cs b/src/Compatibility/ControlGallery/src/Android/FormsAppCompatActivity.cs
index 93c21a8a0533..8f183d9f9a68 100644
--- a/src/Compatibility/ControlGallery/src/Android/FormsAppCompatActivity.cs
+++ b/src/Compatibility/ControlGallery/src/Android/FormsAppCompatActivity.cs
@@ -10,6 +10,7 @@
 using Microsoft.Maui.Controls.Internals;
 using System.Threading.Tasks;
 using System.Net.Http;
+using Microsoft.Maui.Handlers;
 
 namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.Android
 {
@@ -56,7 +57,7 @@ protected override void OnCreate(Bundle bundle)
 			FormsMaps.Init(this, bundle);
 
 #if ENABLE_TEST_CLOUD
-			Handlers.ViewHandler
+			ViewHandler
 				.ViewMapper[nameof(IView.AutomationId)] = (h, v) =>
 				{
 					((global::Android.Views.View)h.NativeView).ContentDescription = v.AutomationId;
diff --git a/src/Compatibility/ControlGallery/src/Android/_1909CustomRenderer.cs b/src/Compatibility/ControlGallery/src/Android/_1909CustomRenderer.cs
index 620215f87a93..091e77a916bd 100644
--- a/src/Compatibility/ControlGallery/src/Android/_1909CustomRenderer.cs
+++ b/src/Compatibility/ControlGallery/src/Android/_1909CustomRenderer.cs
@@ -6,6 +6,7 @@
 using Microsoft.Maui.Controls.Compatibility.Platform.Android.AppCompat;
 using Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues;
 using Microsoft.Maui.Controls.Compatibility;
+using Microsoft.Maui.Controls.Compatibility.Platform.Android;
 
 [assembly: ExportRenderer(typeof(Issue1909.FlatButton), typeof(FlatButtonRenderer))]
 namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.Android
@@ -30,7 +31,7 @@ protected override void OnElementChanged(Microsoft.Maui.Controls.Compatibility.P
 					var nativeButton = (global::Android.Widget.Button)Control;
 					nativeButton.SetShadowLayer(0, 0, 0, global::Android.Graphics.Color.Transparent);
 
-					Microsoft.Maui.Controls.Compatibility.Platform.Android.ViewExtensions.SetElevation(nativeButton, 0);
+					ElevationHelper.SetElevation(nativeButton, 0);
 				}
 			}
 		}
diff --git a/src/Compatibility/ControlGallery/src/Core/Compatibility.ControlGallery.Core-net6.csproj b/src/Compatibility/ControlGallery/src/Core/Compatibility.ControlGallery.Core-net6.csproj
index b32645ecd9bc..b0181fb7ffa8 100644
--- a/src/Compatibility/ControlGallery/src/Core/Compatibility.ControlGallery.Core-net6.csproj
+++ b/src/Compatibility/ControlGallery/src/Core/Compatibility.ControlGallery.Core-net6.csproj
@@ -20,7 +20,7 @@
     <NoWarn>0114;0108;0109;4014;0649;0169;0472;0414;0168;0219;0429</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition="$(TargetFramework.StartsWith('uap10.0'))">
-    <DefineConstants>$(DefineConstants);__UWP__</DefineConstants>
+    <DefineConstants>$(DefineConstants);WINDOWS</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <None Remove="BuildNumber.txt" />
diff --git a/src/Compatibility/ControlGallery/src/Core/Compatibility.ControlGallery.Core.csproj b/src/Compatibility/ControlGallery/src/Core/Compatibility.ControlGallery.Core.csproj
index 47c155fd1d0f..ac6a7f0086c6 100644
--- a/src/Compatibility/ControlGallery/src/Core/Compatibility.ControlGallery.Core.csproj
+++ b/src/Compatibility/ControlGallery/src/Core/Compatibility.ControlGallery.Core.csproj
@@ -20,7 +20,7 @@
     <NoWarn>0114;0108;0109;4014;0649;0169;0472;0414;0168;0219;0429</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition="$(TargetFramework.StartsWith('uap10.0'))">
-    <DefineConstants>$(DefineConstants);__UWP__</DefineConstants>
+    <DefineConstants>$(DefineConstants);WINDOWS</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <None Remove="BuildNumber.txt" />
diff --git a/src/Compatibility/ControlGallery/src/Core/CoreGalleryPages/ButtonCoreGalleryPage.cs b/src/Compatibility/ControlGallery/src/Core/CoreGalleryPages/ButtonCoreGalleryPage.cs
index a0a74898dd9f..4ef1ea919fe9 100644
--- a/src/Compatibility/ControlGallery/src/Core/CoreGalleryPages/ButtonCoreGalleryPage.cs
+++ b/src/Compatibility/ControlGallery/src/Core/CoreGalleryPages/ButtonCoreGalleryPage.cs
@@ -85,7 +85,7 @@ protected override void Build(StackLayout stackLayout)
 				new Button
 				{
 					Text = "Font",
-					Font = Font.SystemFontOfSize(NamedSize.Large, FontAttributes.Bold)
+					Font = Font.SystemFontOfSize(Device.GetNamedSize(NamedSize.Micro, typeof(Button), false), FontWeight.Bold)
 				}
 			);
 
diff --git a/src/Compatibility/ControlGallery/src/Core/GalleryPages/ButtonGallery.cs b/src/Compatibility/ControlGallery/src/Core/GalleryPages/ButtonGallery.cs
index 2c2d598e7090..dcdb97fd8ae1 100644
--- a/src/Compatibility/ControlGallery/src/Core/GalleryPages/ButtonGallery.cs
+++ b/src/Compatibility/ControlGallery/src/Core/GalleryPages/ButtonGallery.cs
@@ -47,7 +47,7 @@ public ButtonGallery()
 					break;
 			}
 
-			var font = Font.OfSize(fontName, NamedSize.Medium);
+			var font = Font.OfSize(fontName, Device.GetNamedSize(NamedSize.Medium, typeof(Button), false));
 
 			var themedButton = new Button
 			{
diff --git a/src/Compatibility/ControlGallery/src/Core/GalleryPages/CellTypeList.cs b/src/Compatibility/ControlGallery/src/Core/GalleryPages/CellTypeList.cs
index 6a517327b5be..7c0ea5f775cd 100644
--- a/src/Compatibility/ControlGallery/src/Core/GalleryPages/CellTypeList.cs
+++ b/src/Compatibility/ControlGallery/src/Core/GalleryPages/CellTypeList.cs
@@ -71,7 +71,7 @@ public CellTypeList()
 
 				Navigation.PushAsync(cellNav.Page);
 				_last = cellNav;
-#if !__WINDOWS__
+#if !WINDOWS
 				SelectedItem = null;
 #endif
 			};
diff --git a/src/Compatibility/ControlGallery/src/EmbeddingTestBeds/Embedding.UWP/Embedding.UWP.csproj b/src/Compatibility/ControlGallery/src/EmbeddingTestBeds/Embedding.UWP/Embedding.UWP.csproj
index 8fd741937aea..76e3504171ac 100644
--- a/src/Compatibility/ControlGallery/src/EmbeddingTestBeds/Embedding.UWP/Embedding.UWP.csproj
+++ b/src/Compatibility/ControlGallery/src/EmbeddingTestBeds/Embedding.UWP/Embedding.UWP.csproj
@@ -24,7 +24,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS</DefineConstants>
     <NoWarn>;2008</NoWarn>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
@@ -34,7 +34,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS</DefineConstants>
     <Optimize>true</Optimize>
     <NoWarn>;2008</NoWarn>
     <DebugType>pdbonly</DebugType>
@@ -47,7 +47,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\ARM\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS</DefineConstants>
     <NoWarn>;2008</NoWarn>
     <DebugType>full</DebugType>
     <PlatformTarget>ARM</PlatformTarget>
@@ -57,7 +57,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
     <OutputPath>bin\ARM\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS</DefineConstants>
     <Optimize>true</Optimize>
     <NoWarn>;2008</NoWarn>
     <DebugType>pdbonly</DebugType>
@@ -70,7 +70,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS</DefineConstants>
     <NoWarn>;2008</NoWarn>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
@@ -80,7 +80,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS</DefineConstants>
     <Optimize>true</Optimize>
     <NoWarn>;2008</NoWarn>
     <DebugType>pdbonly</DebugType>
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla29363.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla29363.cs
index 701322999c8b..d051e4ac504e 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla29363.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla29363.cs
@@ -29,7 +29,7 @@ protected override void Init()
 			Button modal = new Button
 			{
 				Text = "Modal Push Pop Test",
-				Font = Font.SystemFontOfSize(25, FontAttributes.Bold),
+				Font = Font.SystemFontOfSize(25, FontWeight.Bold),
 				HorizontalOptions = LayoutOptions.Center
 			};
 			modal.Clicked += async (object sender, EventArgs e) =>
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla30353.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla30353.cs
index 6e98e72eb23a..dfe0b388cc1f 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla30353.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla30353.cs
@@ -125,7 +125,7 @@ public override void TearDown()
 
 		void Back()
 		{
-#if __IOS__ || __WINDOWS__
+#if __IOS__ || WINDOWS
 			RunningApp.Tap(q => q.Marked("Toggle"));
 #else
 			RunningApp.Back();
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla40408.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla40408.cs
index d01b091de0ff..eebfe248232c 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla40408.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla40408.cs
@@ -124,7 +124,7 @@ void FlyoutPage1_Appearing(object sender, EventArgs e)
 		}
 
 
-#if UITEST && __WINDOWS__
+#if UITEST && WINDOWS
 		[Test]
 		public void OnAppearingEvents()
 		{
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla41271.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla41271.cs
index 1c441877f0bb..a864181c60cc 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla41271.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla41271.cs
@@ -123,7 +123,7 @@ protected override void Init()
 			}
 		}
 
-#if UITEST && __WINDOWS__
+#if UITEST && WINDOWS
 
 		string Cell;
 
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla43519.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla43519.cs
index c43edf4afe6b..b61abd2650d6 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla43519.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla43519.cs
@@ -79,7 +79,7 @@ protected override void Init()
 			});
 		}
 
-#if UITEST && __WINDOWS__
+#if UITEST && WINDOWS
 
 		[Test]
 		public void TabbedModalNavigation()
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla43663.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla43663.cs
index bc85fb201c66..6dfce101dd09 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla43663.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla43663.cs
@@ -125,7 +125,7 @@ void ModalPopped(object sender, ModalPoppedEventArgs e)
 			DisplayAlert("Popped", Message, Cancel);
 		}
 
-#if UITEST && __WINDOWS__
+#if UITEST && WINDOWS
 		[Test]
 		public void ModalNavigation()
 		{
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla45722.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla45722.cs
index a294f0951d59..17fab3f08822 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla45722.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla45722.cs
@@ -156,7 +156,7 @@ protected override void OnDisappearing()
 			base.OnDisappearing();
 		}
 
-#if UITEST && __WINDOWS__
+#if UITEST && WINDOWS
 		[Test]
 		public void LabelsInListViewTemplatesShouldBeCollected()
 		{
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla45722Xaml0.xaml.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla45722Xaml0.xaml.cs
index a300e814290a..f0a22256a199 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla45722Xaml0.xaml.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla45722Xaml0.xaml.cs
@@ -93,7 +93,7 @@ void RefreshModel()
 			}
 		}
 
-#if UITEST && __WINDOWS__
+#if UITEST && WINDOWS
 		[Test]
 		public void LabelsInListViewTemplatesShouldBeCollected()
 		{
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla51825.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla51825.cs
index 464b07ed82f4..be24c93b41c5 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla51825.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla51825.cs
@@ -61,7 +61,7 @@ public void Bugzilla51825Test()
 
 			// Windows App Driver and the Search Bar are a bit buggy
 			// It randomly doesn't enter the first letter
-#if !__WINDOWS__
+#if !WINDOWS
 			Assert.AreEqual("Hello", label.ReadText());
 #endif
 
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla58779.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla58779.cs
index 42cd8fc890ac..d95400f334cc 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla58779.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla58779.cs
@@ -25,7 +25,7 @@ protected override void Init()
 			Button button = new Button
 			{
 				Text = "Click Here",
-				Font = Font.SystemFontOfSize(NamedSize.Large),
+				Font = Font.SystemFontOfSize(Device.GetNamedSize(NamedSize.Large, typeof(Button), false)),
 				BorderWidth = 1,
 				HorizontalOptions = LayoutOptions.Center,
 				VerticalOptions = LayoutOptions.CenterAndExpand,
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla60122.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla60122.cs
index 2ab8d2a18226..dee0fff61bdb 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla60122.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla60122.cs
@@ -52,7 +52,7 @@ public void HandleLongPress(object sender, EventArgs e)
 			}
 		}
 
-#if UITEST && !__WINDOWS__
+#if UITEST && !WINDOWS
 
 		// This test won't work on Windows right now because we can only test desktop, so touch events
 		// (like LongPress) don't really work. The test should work manually on a touch screen, though.
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/DateTimePickerLocalizationTests.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/DateTimePickerLocalizationTests.cs
index d73df7bd95a2..7b14d56cca93 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/DateTimePickerLocalizationTests.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/DateTimePickerLocalizationTests.cs
@@ -59,7 +59,7 @@ public string DateString(String format, String date)
 		public void TimePicker24H()
 		{
 			RunningApp.Tap(x => x.Marked("TimePicker"));
-#if !__WINDOWS__
+#if !WINDOWS
 			Assert.AreEqual("0.0.0 A", TimeString("H.m.s t", "0, 0"));
 			Assert.AreEqual("13:05 PM", TimeString("HH:mm tt", "13, 5"));
 			Assert.AreEqual("12 PM", TimeString("HH tt", "12, 0"));
@@ -70,7 +70,7 @@ public void TimePicker24H()
 #endif
 		}
 
-#if !__WINDOWS__
+#if !WINDOWS
 		[Test]
 		public void TimePicker12H()
 		{
@@ -99,7 +99,7 @@ public void TimePickerOther()
 		public void DatePickerDMY()
 		{
 			RunningApp.Tap(x => x.Marked("DatePicker"));
-#if !__WINDOWS__
+#if !WINDOWS
 			Assert.AreEqual("31/1/99", DateString("d/M/y", "1999, 1, 31"));
 			Assert.AreEqual("02-29-00", DateString("MM-dd-yy", "2000, 2, 29"));
 			Assert.AreEqual("2010, Apr, Thu", DateString("yyy, MMM, ddd", "2010, 4, 15"));
@@ -118,7 +118,7 @@ public void DatePickerDMY()
 		public void DatePickerMissing()
 		{
 			RunningApp.Tap(x => x.Marked("DatePicker"));
-#if !__WINDOWS__
+#if !WINDOWS
 			Assert.AreEqual("October 97", DateString("MMMM yy", "1997, 10, 30"));
 			Assert.AreEqual("Monday", DateString("dddd", "2020, 7, 20"));
 			Assert.AreEqual("2002: Dec", DateString("yyyy: MMM", "2002, 12, 31"));
@@ -129,7 +129,7 @@ public void DatePickerMissing()
 #endif
 		}
 
-#if !__WINDOWS__
+#if !WINDOWS
 		[Test]
 		public void DatePickerLetters()
 		{
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/GestureBubblingTests.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/GestureBubblingTests.cs
index f3e276bc20a7..190b4d32c95f 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/GestureBubblingTests.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/GestureBubblingTests.cs
@@ -163,7 +163,7 @@ from Layout element in layout.InternalChildren
 					from Button button in element.InternalChildren
 					let text = button.Text
 					// UwpIgnore
-#if __WINDOWS__
+#if WINDOWS
 					where text != "Stepper" && text != "Entry"
 #endif
 					select new object[]
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Helpers/UITestHelper.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Helpers/UITestHelper.cs
index e57bc5bc32b7..2cef291b5e10 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Helpers/UITestHelper.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Helpers/UITestHelper.cs
@@ -16,7 +16,7 @@ public static class UITestHelper
 	{
 		public static bool IsWindowClosedException(this Exception exc)
 		{
-#if __WINDOWS__
+#if WINDOWS
 			return exc.Message?.Contains("Currently selected window has been closed") ?? false;
 #else
 			return false;
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1704.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1704.cs
index 1cbbd5cf9233..fa62f79de7b4 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1704.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1704.cs
@@ -490,7 +490,7 @@ public MiscPage()
 
 				int.TryParse(_stressTestItertionEntry.Text, out _stressTestIterationCount);
 
-#if __UWP__
+#if WINDOWS
 				Task.Run(runStressTest);
 #else
 				ThreadPool.QueueUserWorkItem(delegate
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1777.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1777.cs
index d6c573757346..40bb71fb8300 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1777.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1777.cs
@@ -83,7 +83,7 @@ void button_Clicked(object sender, EventArgs e)
 			_pickerNormal.Items.Add("test " + _pickerNormal.Items.Count);
 		}
 
-#if UITEST && __WINDOWS__
+#if UITEST && WINDOWS
 		[Test]
 		public void Issue1777Test()
 		{
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1937.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1937.cs
index b9df16e7980a..54b8ff6c9e74 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1937.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1937.cs
@@ -92,7 +92,7 @@ protected override void Init()
 			};
 		}
 
-#if UITEST && __WINDOWS__
+#if UITEST && WINDOWS
 		[Test]
 		public void Issue1937Test ()
 		{
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2339.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2339.cs
index c9c6d7a5063c..9dad86b9d602 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2339.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2339.cs
@@ -84,7 +84,7 @@ protected override void Init()
 
 #if UITEST
 		[Test]
-#if __WINDOWS__
+#if WINDOWS
 		[Ignore("Focus Behavior is different on UWP")]
 #endif
 		public void FocusAndUnFocusMultipleTimes()
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2399.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2399.cs
index 3c3e78c8ecce..42bb5b24824a 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2399.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2399.cs
@@ -15,7 +15,7 @@ namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues
 	[Preserve(AllMembers = true)]
 	[Issue(IssueTracker.Github, 2399, "Label Renderer Dispose never called")]
 
-#if __WINDOWS__
+#if WINDOWS
 	// this test works fine when ran manually but when executed through the test runner
 	// it fails. Not sure the difference
 	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.ManualReview)]
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2809.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2809.cs
index 5def3e50233f..13ac49a6a570 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2809.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2809.cs
@@ -47,7 +47,7 @@ void ShouldShowMenu()
 #if __ANDROID__
 			//show secondary menu
 			RunningApp.TapOverflowMenuButton();
-#elif __WINDOWS__
+#elif WINDOWS
 			RunningApp.Tap ("MoreButton");
 #endif
 		}
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2894.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2894.cs
index f53b62502987..cd68ded450bf 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2894.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2894.cs
@@ -250,7 +250,7 @@ public void VariousSpanGesturePermutation()
 
 				do
 				{
-#if __WINDOWS__
+#if WINDOWS
 					RunningApp.TapCoordinates(target.X + target.Width - 10, target.Y + 2);
 #else
 					RunningApp.TapCoordinates(target.X + target.CenterX, target.Y + 2);
@@ -267,7 +267,7 @@ public void VariousSpanGesturePermutation()
 			RunningApp.Tap($"TestSpan5");
 			RunningApp.TapCoordinates(target.X + 5, target.Y + 5);
 
-#if __WINDOWS__
+#if WINDOWS
 			RunningApp.TapCoordinates(target.X + target.Width - 10, target.Y + 2);
 #else
 			RunningApp.TapCoordinates(target.X + target.CenterX, target.Y + 2);
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2981.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2981.cs
index 449e02833d1c..176c77ae2c57 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2981.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2981.cs
@@ -26,7 +26,7 @@ protected override void Init()
 			Content = listView;
 		}
 
-#if UITEST && !__WINDOWS__
+#if UITEST && !WINDOWS
 
 		// This test won't work on Windows right now because we can only test desktop, so touch events
 		// (like LongPress) don't really work. The test should work manually on a touch screen, though.
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue3139.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue3139.cs
index cadc03f42550..75bebeb4fa7f 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue3139.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue3139.cs
@@ -44,7 +44,7 @@ protected override async void Init()
 			await alertTask;
 		}
 
-#if UITEST && __WINDOWS__
+#if UITEST && WINDOWS
 		[Test]
 		public void Issue3139Test ()
 		{
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue3652.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue3652.cs
index 14539c04d8dc..7b9a64772567 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue3652.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue3652.cs
@@ -114,7 +114,7 @@ public class ListItemViewModel
 				new Command(() => MessagingCenter.Send(this, "Remove", this));
 		}
 
-#if UITEST && !__WINDOWS__
+#if UITEST && !WINDOWS
 		[Test]
 		public void TestRemovingContextMenuItems()
 		{
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue3840.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue3840.cs
index 3addb02634ce..d63b281e9f43 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue3840.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue3840.cs
@@ -87,7 +87,7 @@ public void TranslatingViewKeepsScrollViewPosition()
 			RunningApp.WaitForElement(_failedText);
 			RunningApp.Tap(_button1);
 			RunningApp.Tap(_button2);
-#if __WINDOWS__
+#if WINDOWS
 			var label = RunningApp.WaitForElement(_failedText);
 			Assert.AreEqual(0, label[0].Rect.Height);
 			Assert.AreEqual(0, label[0].Rect.Width);
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue4597.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue4597.cs
index 587e820ea062..d1dd63b462e4 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue4597.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue4597.cs
@@ -173,7 +173,7 @@ protected override void Init()
 		}
 #if UITEST
 
-#if !__WINDOWS__
+#if !WINDOWS
 		[Test]
 		public void ImageFromFileSourceAppearsAndDisappearsCorrectly()
 		{
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue5412.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue5412.cs
index cc474f2c425b..b586da07927c 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue5412.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue5412.cs
@@ -25,7 +25,7 @@ protected override async void Init()
 			await Navigation.PushModalAsync(new Issue5412MainPage());
 		}
 
-#if UITEST && __WINDOWS__
+#if UITEST && WINDOWS
 		[Test]
 		public void Issue5412Test()
 		{
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue5886.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue5886.cs
index 153d17f7e692..c43427fd82ec 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue5886.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue5886.cs
@@ -79,7 +79,7 @@ void Button_Clicked1(object sender, EventArgs e)
 			button1.IsVisible = true;
 		}
 
-#if UITEST && __WINDOWS__
+#if UITEST && WINDOWS
 		[Test]
 		public void ReplaceRenderer()
 		{
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue6323.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue6323.cs
index f5ae1415403b..eec97bd03e4e 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue6323.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue6323.cs
@@ -27,7 +27,7 @@ protected override void Init()
 			});
 		}
 
-#if UITEST && __WINDOWS__
+#if UITEST && WINDOWS
 		[Test]
 		public void Issue6323Test()
 		{
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue7167.xaml.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue7167.xaml.cs
index 907936545e14..5216920205d0 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue7167.xaml.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue7167.xaml.cs
@@ -6,7 +6,7 @@
 using Microsoft.Maui.Controls.CustomAttributes;
 using Microsoft.Maui.Controls.Internals;
 using Microsoft.Maui.Controls.Xaml;
-#if UITEST && __WINDOWS__
+#if UITEST && WINDOWS
 using Xamarin.UITest;
 using Microsoft.Maui.Controls.Compatibility.UITests;
 using NUnit.Framework;
@@ -40,7 +40,7 @@ void MyListView_OnItemSelected(object sender, SelectedItemChangedEventArgs e)
 
 		}
 
-#if UITEST && __WINDOWS__
+#if UITEST && WINDOWS
 		const string ListViewId = "ListViewId";
 		const string AddCommandID = "AddCommandID";
 		const string ClearListCommandId = "ClearListCommandId";
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue7181.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue7181.cs
index 1f75166b50da..d1b2dfc83a42 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue7181.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue7181.cs
@@ -60,7 +60,7 @@ protected override void Init()
 		private void OnToolbarClicked() =>
 			_toolbarItem.Text = $"{AfterClickToolbarItemText} {_clicks++}";
 
-#if UITEST && (__ANDROID__ || __WINDOWS__)
+#if UITEST && (__ANDROID__ || WINDOWS)
 		[Test]
 		public void ShellToolbarItemTests()
 		{
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue8821.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue8821.cs
index a4bbbbe6ef63..14fe4e0d5b6c 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue8821.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue8821.cs
@@ -74,13 +74,7 @@ async Task CreateImage(string imageUrl)
 		{
 			var bytes = await DownloadImageAsync(imageUrl);
 
-			string path;
-
-#if WINDOWS_UWP
-			path = Windows.Storage.ApplicationData.Current.LocalFolder.Path;
-#else
-			path = Environment.GetFolderPath(Environment.SpecialFolder.Personal);
-#endif
+			string path = Environment.GetFolderPath(Environment.SpecialFolder.Personal);
 			SecondImageSource = IOPath.Combine(path, "Issue8821.gif");
 			File.WriteAllBytes(SecondImageSource, bytes);
 
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/TestPages/ScreenshotConditionalApp.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/TestPages/ScreenshotConditionalApp.cs
index b6ce01d895d3..357f5f68a7d9 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/TestPages/ScreenshotConditionalApp.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/TestPages/ScreenshotConditionalApp.cs
@@ -221,7 +221,7 @@ public void WaitFor(Func<bool> predicate, string timeoutMessage = "Timed out wai
 		public AppResult WaitForFirstElement(string marked, string timeoutMessage = "Timed out waiting for element...",
 			TimeSpan? timeout = null, TimeSpan? retryFrequency = null)
 		{
-#if __WINDOWS__
+#if WINDOWS
 			return (_app as WinDriverApp).WaitForFirstElement(marked, timeoutMessage, timeout, retryFrequency);
 #else
 			return _app.WaitForElement(marked, timeoutMessage, timeout, retryFrequency).FirstOrDefault();
@@ -463,7 +463,7 @@ public ITestServer TestServer
 			get { return _app.TestServer; }
 		}
 
-#if __WINDOWS__
+#if WINDOWS
 		public string ReadDatePicker(string marked)
 		{
 			return ((WinDriverApp)_app).ReadDatePicker(marked).ToString();
@@ -490,7 +490,7 @@ public void TestSetup(Type testType, bool isolate)
 
 			UITestHelper.MarkTestInconclusiveIfNoInternetConnectionIsPresent(testType, _app);
 
-#if __WINDOWS__
+#if WINDOWS
 			RestartIfAppIsClosed();
 #endif
 
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/TestPages/TestPages.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/TestPages/TestPages.cs
index bacc0592a11d..77fa1324e935 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/TestPages/TestPages.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/TestPages/TestPages.cs
@@ -55,7 +55,7 @@ static IApp InitializeApp()
 			Xamarin.UITest.Desktop.TestAgent.Start();
 			app = InitializeMacOSApp();
 
-#elif __WINDOWS__
+#elif WINDOWS
 			app = InitializeUWPApp();
 #endif
 			if (app == null)
@@ -144,7 +144,7 @@ static IApp InitializeMacOSApp()
 		}
 #endif
 
-#if __WINDOWS__
+#if WINDOWS
 		static IApp InitializeUWPApp()
 		{
 			return WindowsTestBase.ConfigureApp();
@@ -170,7 +170,7 @@ public static void NavigateToIssue(Type type, IApp app)
 			int maxAttempts = 2;
 			int attempts = 0;
 
-#if __WINDOWS__
+#if WINDOWS
 			bool attemptOneRestart = false;
 			bool waitNoElementAttempt = false;
 #endif
@@ -195,7 +195,7 @@ public static void NavigateToIssue(Type type, IApp app)
 				}
 #endif
 
-#if __WINDOWS__
+#if WINDOWS
 					// Windows doens't have an 'invoke' option right now for us to do the more direct navigation
 					// we're using for Android/iOS
 					// So we're just going to use the 'Reset' method to bounce the app to the opening screen
@@ -223,7 +223,7 @@ public static void NavigateToIssue(Type type, IApp app)
 					app.WaitForElement(q => q.Raw("* marked:'SearchButton'"));
 					app.Tap(q => q.Raw("* marked:'SearchButton'"));
 
-#if __WINDOWS__
+#if WINDOWS
 					try
 					{
 						if (!waitNoElementAttempt)
@@ -243,7 +243,7 @@ public static void NavigateToIssue(Type type, IApp app)
 					if (!app.RestartIfAppIsClosed())
 						return;
 				}
-#if __WINDOWS__
+#if WINDOWS
 				catch (Exception we)
 				when (we.IsWindowClosedException() && !attemptOneRestart)
 				{
@@ -573,7 +573,7 @@ public virtual void TearDown()
 	public abstract class TestShell : Shell
 	{
 		protected const string FlyoutIconAutomationId = "OK";
-#if __IOS__ || __WINDOWS__
+#if __IOS__ || WINDOWS
 		protected const string BackButtonAutomationId = "Back";
 #else
 		protected const string BackButtonAutomationId = "OK";
@@ -828,7 +828,7 @@ public void TapBackArrow(string backArrowIcon = BackButtonAutomationId)
 		public void TapInFlyout(string text, string flyoutIcon = FlyoutIconAutomationId, bool usingSwipe = false, string timeoutMessage = null, bool makeSureFlyoutStaysOpen = false)
 		{
 			timeoutMessage = timeoutMessage ?? text;
-#if __WINDOWS__
+#if WINDOWS
 			RunningApp.WaitForElement(flyoutIcon);
 #endif
 
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/VisualControlsPage.xaml.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/VisualControlsPage.xaml.cs
index e72b73e0539c..3627f7f2d728 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/VisualControlsPage.xaml.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/VisualControlsPage.xaml.cs
@@ -38,7 +38,7 @@ protected override void Init()
 			{
 			}
 
-#if UITEST && !__WINDOWS__
+#if UITEST && !WINDOWS
 			[Test]
 			public void LoadingVisualGalleryPageDoesNotCrash()
 			{
diff --git a/src/Compatibility/ControlGallery/src/UITests.Shared/BaseTestFixture.cs b/src/Compatibility/ControlGallery/src/UITests.Shared/BaseTestFixture.cs
index f14bb96c7db2..46e863fadb0c 100644
--- a/src/Compatibility/ControlGallery/src/UITests.Shared/BaseTestFixture.cs
+++ b/src/Compatibility/ControlGallery/src/UITests.Shared/BaseTestFixture.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Diagnostics;
-using NUnit.Framework;
 using Microsoft.Maui.Controls.Compatibility.ControlGallery;
 using Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues;
+using NUnit.Framework;
 using Xamarin.UITest;
 using Xamarin.UITest.Queries;
 
@@ -108,7 +108,7 @@ protected void ResetApp()
 #if __ANDROID__
 			App.Invoke("Reset");
 #endif
-#if __WINDOWS__
+#if WINDOWS
 			WindowsTestBase.Reset();
 #endif
 		}
diff --git a/src/Compatibility/ControlGallery/src/UITests.Shared/PlatformQueries.cs b/src/Compatibility/ControlGallery/src/UITests.Shared/PlatformQueries.cs
index c7fcfb18616f..b1bb682c437d 100644
--- a/src/Compatibility/ControlGallery/src/UITests.Shared/PlatformQueries.cs
+++ b/src/Compatibility/ControlGallery/src/UITests.Shared/PlatformQueries.cs
@@ -29,7 +29,7 @@ internal static class PlatformMethodQueries
 			{ View.ScaleProperty, Tuple.Create (new[] { "getLayerTransformString" }, true) },
 		};
 
-#elif __ANDROID__ || __WINDOWS__
+#elif __ANDROID__ || WINDOWS
 		public static readonly Dictionary<BindableProperty, Tuple<string[], bool>> PropertyPlatformMethodDictionary = new Dictionary
 			<BindableProperty, Tuple<string[], bool>>
 			{
@@ -86,7 +86,7 @@ internal static class PlatformViews
 		public static readonly string TableView = "UITableView";
 		public static readonly string TimePicker = "UITextField";
 		public static readonly string WebView = "WKWebView";
-#elif __ANDROID__ || __WINDOWS__
+#elif __ANDROID__ || WINDOWS
 		public static readonly string ActivityIndicator = "android.widget.ProgressBar";
 		public static readonly string BoxView = "xamarin.forms.platform.android.BoxRenderer";
 		public static readonly string Button = "android.widget.Button";
@@ -124,7 +124,7 @@ internal static class PlatformQueries
 		public static readonly Func<AppQuery, AppQuery> PageWithoutNavigationBar = q => q.Raw("*").Index(7);
 		public static readonly Func<AppQuery, AppQuery> NavigationBarBackButton = q => q.Class("UINavigationItemButtonView");
 
-#elif __ANDROID__ || __WINDOWS__
+#elif __ANDROID__ || WINDOWS
 		public static readonly Func<AppQuery, AppQuery> Root = q => q.Id("content");
 		public static readonly Func<AppQuery, AppQuery> RootPageListView = q => q.Raw("ListViewRenderer index:0");
 		public static readonly Func<AppQuery, AppQuery> GalleryListView = q => q.Raw("ListViewRenderer index:1");
diff --git a/src/Compatibility/ControlGallery/src/UITests.Shared/Queries.cs b/src/Compatibility/ControlGallery/src/UITests.Shared/Queries.cs
index 019c34a37d77..5d488eb216ac 100644
--- a/src/Compatibility/ControlGallery/src/UITests.Shared/Queries.cs
+++ b/src/Compatibility/ControlGallery/src/UITests.Shared/Queries.cs
@@ -112,7 +112,7 @@ internal static class Rects
 	{
 		public static AppRect RootViewRect(this IApp app)
 		{
-#if __WINDOWS__
+#if WINDOWS
 			return app.Query(WinDriverApp.AppName)[0].Rect;
 #else
 			return app.Query(q => q.Raw("* index:0"))[0].Rect;
diff --git a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/ActionSheetUITests.cs b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/ActionSheetUITests.cs
index 9d78d28062bd..c5cb97532539 100644
--- a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/ActionSheetUITests.cs
+++ b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/ActionSheetUITests.cs
@@ -163,7 +163,7 @@ void ScrollAndTap(string actionSheet)
 		{
 			var queryString = $"* text:'{actionSheet}'";
 			Func<AppQuery, AppQuery> actionSheetQuery = q => q.Raw(queryString);
-#if __WINDOWS__
+#if WINDOWS
 			App.ScrollDownTo(actionSheetQuery);
 #elif __MACOS__
 			App.Tap(actionSheetQuery);
diff --git a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/ActivityIndicatorUITests.cs b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/ActivityIndicatorUITests.cs
index 88861cb41f8e..810c752b5e48 100644
--- a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/ActivityIndicatorUITests.cs
+++ b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/ActivityIndicatorUITests.cs
@@ -1,5 +1,5 @@
-using NUnit.Framework;
 using Microsoft.Maui.Controls.CustomAttributes;
+using NUnit.Framework;
 
 namespace Microsoft.Maui.Controls.Compatibility.UITests
 {
@@ -55,7 +55,7 @@ public void IsRunning()
 			remote.GoTo();
 #if __MACOS__
 			Assert.Inconclusive("Not tested yet");
-#elif __WINDOWS__
+#elif WINDOWS
 			Assert.Inconclusive(PleaseInspect);
 #else
 			var isRunning = remote.GetProperty<bool>(ActivityIndicator.IsRunningProperty);
diff --git a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/BoxViewUITests.cs b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/BoxViewUITests.cs
index dc69cd782ef3..e2ff61f6cded 100644
--- a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/BoxViewUITests.cs
+++ b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/BoxViewUITests.cs
@@ -1,5 +1,5 @@
-using NUnit.Framework;
 using Microsoft.Maui.Controls.CustomAttributes;
+using NUnit.Framework;
 
 namespace Microsoft.Maui.Controls.Compatibility.UITests
 {
@@ -54,12 +54,12 @@ protected override void FixtureTeardown()
 		public override void _Opacity() { }
 #endif
 
-#if __ANDROID__ || __IOS__ || __WINDOWS__
+#if __ANDROID__ || __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _IsEnabled() { }
 #endif
 
-#if __ANDROID__ || __IOS__ || __WINDOWS__
+#if __ANDROID__ || __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _Rotation() { }
 
@@ -78,7 +78,7 @@ public override void _TranslationX() { }
 		public override void _TranslationY() { }
 #endif
 
-#if __IOS__ || __WINDOWS__
+#if __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _Scale() { }
 #endif
diff --git a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/ButtonUITests.cs b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/ButtonUITests.cs
index 83ac4ad2bf25..a8fcdab27c73 100644
--- a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/ButtonUITests.cs
+++ b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/ButtonUITests.cs
@@ -1,6 +1,6 @@
-using NUnit.Framework;
 using Microsoft.Maui.Controls.CustomAttributes;
 using Microsoft.Maui.Graphics;
+using NUnit.Framework;
 
 namespace Microsoft.Maui.Controls.Compatibility.UITests
 {
@@ -126,7 +126,7 @@ public void Font()
 			Assert.Inconclusive("needs testing");
 #else
 			var font = remote.GetProperty<Font>(Button.FontProperty);
-			Assert.True(font.FontAttributes.HasFlag(FontAttributes.Bold));
+			Assert.AreEqual (FontWeight.Bold, font.Weight);
 #endif
 		}
 
@@ -179,12 +179,12 @@ protected override void FixtureTeardown()
 		public override void _Opacity() { }
 #endif
 
-#if __ANDROID__ || __IOS__ || __WINDOWS__
+#if __ANDROID__ || __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _IsEnabled() { }
 #endif
 
-#if __ANDROID__ || __IOS__ || __WINDOWS__
+#if __ANDROID__ || __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _Rotation() { }
 
@@ -203,7 +203,7 @@ public override void _TranslationX() { }
 		public override void _TranslationY() { }
 #endif
 
-#if __IOS__ || __WINDOWS__
+#if __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _Scale() { }
 #endif
diff --git a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/CheckBoxUITests.cs b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/CheckBoxUITests.cs
index 4e2a7a753801..e5e781f74760 100644
--- a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/CheckBoxUITests.cs
+++ b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/CheckBoxUITests.cs
@@ -1,5 +1,5 @@
-using NUnit.Framework;
 using Microsoft.Maui.Controls.CustomAttributes;
+using NUnit.Framework;
 
 namespace Microsoft.Maui.Controls.Compatibility.UITests
 {
@@ -50,12 +50,12 @@ protected override void FixtureTeardown()
 		public override void _Opacity() { }
 #endif
 
-#if __ANDROID__ || __IOS__ || __WINDOWS__
+#if __ANDROID__ || __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _IsEnabled() { }
 #endif
 
-#if __ANDROID__ || __IOS__ || __WINDOWS__
+#if __ANDROID__ || __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _Rotation() { }
 
@@ -74,7 +74,7 @@ public override void _TranslationX() { }
 		public override void _TranslationY() { }
 #endif
 
-#if __IOS__ || __WINDOWS__
+#if __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _Scale() { }
 #endif
diff --git a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/DatePickerUITests.cs b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/DatePickerUITests.cs
index f6681fee35c8..596c424e16ec 100644
--- a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/DatePickerUITests.cs
+++ b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/DatePickerUITests.cs
@@ -1,5 +1,5 @@
-using NUnit.Framework;
 using Microsoft.Maui.Controls.CustomAttributes;
+using NUnit.Framework;
 
 namespace Microsoft.Maui.Controls.Compatibility.UITests
 {
@@ -52,12 +52,12 @@ protected override void FixtureTeardown()
 		public override void _Opacity() { }
 #endif
 
-#if __ANDROID__ || __IOS__ || __WINDOWS__
+#if __ANDROID__ || __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _IsEnabled() { }
 #endif
 
-#if __ANDROID__ || __IOS__ || __WINDOWS__
+#if __ANDROID__ || __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _Rotation() { }
 
@@ -76,7 +76,7 @@ public override void _TranslationX() { }
 		public override void _TranslationY() { }
 #endif
 
-#if __IOS__ || __WINDOWS__
+#if __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _Scale() { }
 #endif
diff --git a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/EditorUITests.cs b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/EditorUITests.cs
index b081f036b254..54dac31c6e06 100644
--- a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/EditorUITests.cs
+++ b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/EditorUITests.cs
@@ -1,5 +1,5 @@
-using NUnit.Framework;
 using Microsoft.Maui.Controls.CustomAttributes;
+using NUnit.Framework;
 
 namespace Microsoft.Maui.Controls.Compatibility.UITests
 {
@@ -52,12 +52,12 @@ protected override void FixtureTeardown()
 		public override void _Opacity() { }
 #endif
 
-#if __ANDROID__ || __IOS__ || __WINDOWS__
+#if __ANDROID__ || __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _IsEnabled() { }
 #endif
 
-#if __ANDROID__ || __IOS__ || __WINDOWS__
+#if __ANDROID__ || __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _Rotation() { }
 
@@ -76,7 +76,7 @@ public override void _TranslationX() { }
 		public override void _TranslationY() { }
 #endif
 
-#if __IOS__ || __WINDOWS__
+#if __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _Scale() { }
 #endif
diff --git a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/EntryUITests.cs b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/EntryUITests.cs
index 2ae896be04ef..ed8f53fb0540 100644
--- a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/EntryUITests.cs
+++ b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/EntryUITests.cs
@@ -1,6 +1,6 @@
-using NUnit.Framework;
 using Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues;
 using Microsoft.Maui.Controls.CustomAttributes;
+using NUnit.Framework;
 using Xamarin.UITest;
 using Xamarin.UITest.Queries;
 
@@ -103,12 +103,12 @@ protected override void FixtureTeardown()
 		public override void _Opacity() { }
 #endif
 
-#if __ANDROID__ || __IOS__ || __WINDOWS__
+#if __ANDROID__ || __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _IsEnabled() { }
 #endif
 
-#if __ANDROID__ || __IOS__ || __WINDOWS__
+#if __ANDROID__ || __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _Rotation() { }
 
@@ -127,7 +127,7 @@ public override void _TranslationX() { }
 		public override void _TranslationY() { }
 #endif
 
-#if __IOS__ || __WINDOWS__
+#if __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _Scale() { }
 #endif
diff --git a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/FrameUITests.cs b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/FrameUITests.cs
index b69d5a22fc89..83ae19447318 100644
--- a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/FrameUITests.cs
+++ b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/FrameUITests.cs
@@ -1,5 +1,5 @@
-using NUnit.Framework;
 using Microsoft.Maui.Controls.CustomAttributes;
+using NUnit.Framework;
 
 namespace Microsoft.Maui.Controls.Compatibility.UITests
 {
@@ -54,12 +54,12 @@ protected override void FixtureTeardown()
 		public override void _Opacity() { }
 #endif
 
-#if __ANDROID__ || __IOS__ || __WINDOWS__
+#if __ANDROID__ || __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _IsEnabled() { }
 #endif
 
-#if __ANDROID__ || __IOS__ || __WINDOWS__
+#if __ANDROID__ || __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _Rotation() { }
 
@@ -78,7 +78,7 @@ public override void _TranslationX() { }
 		public override void _TranslationY() { }
 #endif
 
-#if __IOS__ || __WINDOWS__
+#if __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _Scale() { }
 #endif
diff --git a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/ImageButtonUITests.cs b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/ImageButtonUITests.cs
index d00695ab57a2..1d2665b94a8a 100644
--- a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/ImageButtonUITests.cs
+++ b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/ImageButtonUITests.cs
@@ -1,6 +1,6 @@
 using System.Threading;
-using NUnit.Framework;
 using Microsoft.Maui.Controls.CustomAttributes;
+using NUnit.Framework;
 
 namespace Microsoft.Maui.Controls.Compatibility.UITests
 {
@@ -161,12 +161,12 @@ public void Image()
 		public override void _Opacity() { }
 #endif
 
-#if __ANDROID__ || __IOS__ || __WINDOWS__
+#if __ANDROID__ || __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _IsEnabled() { }
 #endif
 
-#if __ANDROID__ || __IOS__ || __WINDOWS__
+#if __ANDROID__ || __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _Rotation() { }
 
@@ -185,7 +185,7 @@ public override void _TranslationX() { }
 		public override void _TranslationY() { }
 #endif
 
-#if __IOS__ || __WINDOWS__
+#if __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _Scale() { }
 #endif
diff --git a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/ImageUITests.cs b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/ImageUITests.cs
index 7492cc948d6f..7482e9a4341a 100644
--- a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/ImageUITests.cs
+++ b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/ImageUITests.cs
@@ -1,6 +1,6 @@
 using System.Threading;
-using NUnit.Framework;
 using Microsoft.Maui.Controls.CustomAttributes;
+using NUnit.Framework;
 
 namespace Microsoft.Maui.Controls.Compatibility.UITests
 {
@@ -58,12 +58,12 @@ protected override void FixtureTeardown()
 		public override void _Opacity() { }
 #endif
 
-#if __ANDROID__ || __IOS__ || __WINDOWS__
+#if __ANDROID__ || __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _IsEnabled() { }
 #endif
 
-#if __ANDROID__ || __IOS__ || __WINDOWS__
+#if __ANDROID__ || __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _Rotation() { }
 
@@ -82,7 +82,7 @@ public override void _TranslationX() { }
 		public override void _TranslationY() { }
 #endif
 
-#if __IOS__ || __WINDOWS__
+#if __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _Scale() { }
 #endif
diff --git a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/LabelUITests.cs b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/LabelUITests.cs
index 5fcaecca38f4..13eed50423a0 100644
--- a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/LabelUITests.cs
+++ b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/LabelUITests.cs
@@ -1,5 +1,5 @@
-using NUnit.Framework;
 using Microsoft.Maui.Controls.CustomAttributes;
+using NUnit.Framework;
 
 namespace Microsoft.Maui.Controls.Compatibility.UITests
 {
@@ -51,12 +51,12 @@ protected override void FixtureTeardown()
 		public override void _Opacity() { }
 #endif
 
-#if __ANDROID__ || __IOS__ || __WINDOWS__
+#if __ANDROID__ || __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _IsEnabled() { }
 #endif
 
-#if __ANDROID__ || __IOS__ || __WINDOWS__
+#if __ANDROID__ || __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _Rotation() { }
 
@@ -75,7 +75,7 @@ public override void _TranslationX() { }
 		public override void _TranslationY() { }
 #endif
 
-#if __IOS__ || __WINDOWS__
+#if __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _Scale() { }
 #endif
diff --git a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/Legacy-CellsUITests.cs b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/Legacy-CellsUITests.cs
index d6ca8beac60f..7d98d15c6099 100644
--- a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/Legacy-CellsUITests.cs
+++ b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/Legacy-CellsUITests.cs
@@ -2,8 +2,8 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using NUnit.Framework;
 using Microsoft.Maui.Controls.CustomAttributes;
+using NUnit.Framework;
 
 namespace Microsoft.Maui.Controls.Compatibility.UITests
 {
@@ -27,7 +27,7 @@ protected override void NavigateToGallery()
 
 		void SelectTest(string testName)
 		{
-#if __WINDOWS__
+#if WINDOWS
 			App.ScrollDownTo(testName);
 #else
 			App.ScrollForElement($"* marked:'{testName}'",
@@ -58,7 +58,7 @@ public void CellsGalleryTextCellList()
 
 			string target = "Detail 99";
 
-#if __WINDOWS__
+#if WINDOWS
 			App.ScrollDownTo(target, CellTestContainerId, timeout: TimeSpan.FromMinutes(1));
 #else
 			App.ScrollForElement($"* marked:'{target}'",
@@ -84,7 +84,7 @@ public void CellsGalleryTextCellTable()
 
 			string target = "Detail 12";
 
-#if __WINDOWS__
+#if WINDOWS
 			App.ScrollDownTo(target, CellTestContainerId, timeout: TimeSpan.FromMinutes(1));
 #else
 			App.ScrollForElement($"* marked:'{target}'",
@@ -114,7 +114,7 @@ public void CellsGalleryImageCellList()
 
 			string target = "Detail 99";
 
-#if __WINDOWS__
+#if WINDOWS
 			App.ScrollDownTo(target, CellTestContainerId, timeout: TimeSpan.FromMinutes(3));
 #else
 			var scrollBounds = App.Query(q => q.Marked(CellTestContainerId)).First().Rect;
@@ -126,7 +126,7 @@ public void CellsGalleryImageCellList()
 
 			App.Screenshot("All ImageCells are present");
 
-#if !__WINDOWS__
+#if !WINDOWS
 			var numberOfImages = App.Query(q => q.Raw(PlatformViews.Image)).Length;
 			// Check that there are images present. In Android, 
 			// have to make sure that there are more than 2 for navigation.
@@ -188,7 +188,7 @@ public void CellsGalleryImageCellTable()
 
 			string target = "Detail 12";
 
-#if __WINDOWS__
+#if WINDOWS
 			App.ScrollDownTo(target, CellTestContainerId, timeout: TimeSpan.FromMinutes(1));
 #else
 			App.ScrollForElement($"* marked:'{target}'",
@@ -199,7 +199,7 @@ public void CellsGalleryImageCellTable()
 
 			App.Screenshot("All ImageCells are present");
 
-#if !__WINDOWS__
+#if !WINDOWS
 			var numberOfImages = App.Query(q => q.Raw(PlatformViews.Image)).Length;
 			// Check that there are images present. In Android, 
 			// have to make sure that there are more than 2 for navigation.
@@ -223,7 +223,7 @@ public void CellsGallerySwitchCellList()
 
 			string target = "Label 99";
 
-#if __WINDOWS__
+#if WINDOWS
 			App.ScrollDownTo(target, CellTestContainerId, timeout: TimeSpan.FromMinutes(1));
 #else
 			App.ScrollForElement($"* marked:'{target}'",
@@ -252,7 +252,7 @@ public void CellsGallerySwitchCellTable()
 
 			string target = "text 32";
 
-#if __WINDOWS__
+#if WINDOWS
 			App.ScrollDownTo(target, CellTestContainerId, timeout: TimeSpan.FromMinutes(1));
 #else
 			App.ScrollForElement($"* marked:'{target}'",
@@ -281,7 +281,7 @@ public void CellsGalleryEntryCellList()
 
 			string target = "Label 99";
 
-#if __WINDOWS__
+#if WINDOWS
 			App.ScrollDownTo(target, CellTestContainerId, timeout: TimeSpan.FromMinutes(3));
 #else
 			App.ScrollForElement($"* marked:'{target}'",
@@ -305,7 +305,7 @@ public void CellsGalleryEntryCellTable()
 
 			string target = "Text 32";
 
-#if __WINDOWS__
+#if WINDOWS
 			App.ScrollDownTo(target, CellTestContainerId, timeout: TimeSpan.FromMinutes(1));
 #else
 			App.ScrollForElement($"* marked:'{target}'",
@@ -329,7 +329,7 @@ public void CellsGalleryEntryCellCompleted()
 
 			string target = "Enter text";
 
-#if __WINDOWS__
+#if WINDOWS
 			App.ScrollDownTo(target, CellTestContainerId, timeout: TimeSpan.FromMinutes(1));
 #else
 			App.ScrollForElement($"* marked:'{target}'",
@@ -340,7 +340,7 @@ public void CellsGalleryEntryCellCompleted()
 
 			App.Screenshot("Before clicking Entry");
 
-#if !__IOS__ && !__WINDOWS__
+#if !__IOS__ && !WINDOWS
 			App.Tap(PlatformQueries.EntryCellWithPlaceholder("I am a placeholder"));
 			App.EnterText(PlatformQueries.EntryCellWithPlaceholder("I am a placeholder"), "Hi");
 			App.Screenshot("Entered Text");
diff --git a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/MaterialEntryUITests.cs b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/MaterialEntryUITests.cs
index 967a6d761f82..befc4ae9db69 100644
--- a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/MaterialEntryUITests.cs
+++ b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/MaterialEntryUITests.cs
@@ -1,6 +1,6 @@
-using NUnit.Framework;
-using Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues;
+using Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues;
 using Microsoft.Maui.Controls.CustomAttributes;
+using NUnit.Framework;
 
 namespace Microsoft.Maui.Controls.Compatibility.UITests
 {
diff --git a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/PickerUITests.cs b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/PickerUITests.cs
index b1810c0a3c10..c9929b07901b 100644
--- a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/PickerUITests.cs
+++ b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/PickerUITests.cs
@@ -1,6 +1,5 @@
-using NUnit.Framework;
-
 using Microsoft.Maui.Controls.CustomAttributes;
+using NUnit.Framework;
 
 namespace Microsoft.Maui.Controls.Compatibility.UITests
 {
@@ -44,12 +43,12 @@ protected override void FixtureTeardown()
 		public override void _Opacity() { }
 #endif
 
-#if __ANDROID__ || __IOS__ || __WINDOWS__
+#if __ANDROID__ || __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _IsEnabled() { }
 #endif
 
-#if __ANDROID__ || __IOS__ || __WINDOWS__
+#if __ANDROID__ || __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _Rotation() { }
 
@@ -68,7 +67,7 @@ public override void _TranslationX() { }
 		public override void _TranslationY() { }
 #endif
 
-#if __IOS__ || __WINDOWS__
+#if __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _Scale() { }
 #endif
diff --git a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/ProgressBarUITests.cs b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/ProgressBarUITests.cs
index 7262c70bf659..2d93081e980a 100644
--- a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/ProgressBarUITests.cs
+++ b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/ProgressBarUITests.cs
@@ -1,5 +1,5 @@
-using NUnit.Framework;
 using Microsoft.Maui.Controls.CustomAttributes;
+using NUnit.Framework;
 
 namespace Microsoft.Maui.Controls.Compatibility.UITests
 {
@@ -51,12 +51,12 @@ protected override void FixtureTeardown()
 		public override void _Opacity() { }
 #endif
 
-#if __ANDROID__ || __IOS__ || __WINDOWS__
+#if __ANDROID__ || __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _IsEnabled() { }
 #endif
 
-#if __ANDROID__ || __IOS__ || __WINDOWS__
+#if __ANDROID__ || __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _Rotation() { }
 
@@ -75,7 +75,7 @@ public override void _TranslationX() { }
 		public override void _TranslationY() { }
 #endif
 
-#if __IOS__ || __WINDOWS__
+#if __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _Scale() { }
 #endif
diff --git a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/RadioButtonUITests.cs b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/RadioButtonUITests.cs
index 9fe5cfb88aa7..558a035e09ff 100644
--- a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/RadioButtonUITests.cs
+++ b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/RadioButtonUITests.cs
@@ -1,6 +1,6 @@
 using System;
-using NUnit.Framework;
 using Microsoft.Maui.Controls.CustomAttributes;
+using NUnit.Framework;
 
 namespace Microsoft.Maui.Controls.Compatibility.UITests
 {
@@ -55,12 +55,12 @@ protected override void FixtureTeardown()
 		public override void _Opacity() { }
 #endif
 
-#if __ANDROID__ || __IOS__ || __WINDOWS__
+#if __ANDROID__ || __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _IsEnabled() { }
 #endif
 
-#if __ANDROID__ || __IOS__ || __WINDOWS__
+#if __ANDROID__ || __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _Rotation() { }
 
@@ -79,7 +79,7 @@ public override void _TranslationX() { }
 		public override void _TranslationY() { }
 #endif
 
-#if __IOS__ || __WINDOWS__
+#if __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _Scale() { }
 #endif
diff --git a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/RootGalleryUITests.cs b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/RootGalleryUITests.cs
index 56398f0010ec..951ef8d3a5ec 100644
--- a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/RootGalleryUITests.cs
+++ b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/RootGalleryUITests.cs
@@ -73,7 +73,7 @@ public void VisitEachPage()
 		{
 			foreach (var page in rootPages)
 			{
-#if __WINDOWS__
+#if WINDOWS
 				App.ScrollDownTo(page.ButtonId, "ChoosePageScrollView");
 #else
 				var scrollViewArea = App.Query(q => q.Marked("ChoosePageScrollView")).First().Rect;
diff --git a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/SearchBarUITests.cs b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/SearchBarUITests.cs
index c15fe49de9e0..9d53ec138ee5 100644
--- a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/SearchBarUITests.cs
+++ b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/SearchBarUITests.cs
@@ -1,5 +1,5 @@
-using NUnit.Framework;
 using Microsoft.Maui.Controls.CustomAttributes;
+using NUnit.Framework;
 
 namespace Microsoft.Maui.Controls.Compatibility.UITests
 {
@@ -42,12 +42,12 @@ protected override void FixtureTeardown()
 		public override void _Opacity() { }
 #endif
 
-#if __ANDROID__ || __IOS__ || __WINDOWS__
+#if __ANDROID__ || __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _IsEnabled() { }
 #endif
 
-#if __ANDROID__ || __IOS__ || __WINDOWS__
+#if __ANDROID__ || __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _Rotation() { }
 
@@ -66,7 +66,7 @@ public override void _TranslationX() { }
 		public override void _TranslationY() { }
 #endif
 
-#if __IOS__ || __WINDOWS__
+#if __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _Scale() { }
 #endif
diff --git a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/SliderUITests.cs b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/SliderUITests.cs
index 335127cfae76..1f6d8ea52263 100644
--- a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/SliderUITests.cs
+++ b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/SliderUITests.cs
@@ -1,5 +1,5 @@
-using NUnit.Framework;
 using Microsoft.Maui.Controls.CustomAttributes;
+using NUnit.Framework;
 
 namespace Microsoft.Maui.Controls.Compatibility.UITests
 {
@@ -50,12 +50,12 @@ protected override void FixtureTeardown()
 		public override void _Opacity() { }
 #endif
 
-#if __ANDROID__ || __IOS__ || __WINDOWS__
+#if __ANDROID__ || __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _IsEnabled() { }
 #endif
 
-#if __ANDROID__ || __IOS__ || __WINDOWS__
+#if __ANDROID__ || __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _Rotation() { }
 
@@ -74,7 +74,7 @@ public override void _TranslationX() { }
 		public override void _TranslationY() { }
 #endif
 
-#if __IOS__ || __WINDOWS__
+#if __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _Scale() { }
 #endif
diff --git a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/StepperUITests.cs b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/StepperUITests.cs
index 7020b6f3b50b..7a78b1ee96af 100644
--- a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/StepperUITests.cs
+++ b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/StepperUITests.cs
@@ -1,5 +1,5 @@
-using NUnit.Framework;
 using Microsoft.Maui.Controls.CustomAttributes;
+using NUnit.Framework;
 
 namespace Microsoft.Maui.Controls.Compatibility.UITests
 {
@@ -37,7 +37,7 @@ public override void _UnFocus()
 		{
 		}
 
-#if __ANDROID__ || __IOS__ || __WINDOWS__
+#if __ANDROID__ || __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 #endif
 		[Category(UITestCategories.UwpIgnore)]
@@ -51,7 +51,7 @@ public override void _IsEnabled()
 		[Ignore("This is covered by the platform tests")]
 		public override void _IsVisible() { }
 #else
-		[Category(UITestCategories.UwpIgnore)] 
+		[Category(UITestCategories.UwpIgnore)]
 		public override void _IsVisible()
 		{
 			base._IsVisible();
@@ -71,7 +71,7 @@ protected override void FixtureTeardown()
 		public override void _Opacity() { }
 #endif
 
-#if __ANDROID__ || __IOS__ || __WINDOWS__
+#if __ANDROID__ || __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _Rotation() { }
 
@@ -90,7 +90,7 @@ public override void _TranslationX() { }
 		public override void _TranslationY() { }
 #endif
 
-#if __IOS__ || __WINDOWS__
+#if __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _Scale() { }
 #endif
diff --git a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/SwitchUITests.cs b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/SwitchUITests.cs
index ce7aaf859342..ab27fc5bfbea 100644
--- a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/SwitchUITests.cs
+++ b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/SwitchUITests.cs
@@ -1,5 +1,5 @@
-using NUnit.Framework;
 using Microsoft.Maui.Controls.CustomAttributes;
+using NUnit.Framework;
 
 namespace Microsoft.Maui.Controls.Compatibility.UITests
 {
@@ -50,12 +50,12 @@ protected override void FixtureTeardown()
 		public override void _Opacity() { }
 #endif
 
-#if __ANDROID__ || __IOS__ || __WINDOWS__
+#if __ANDROID__ || __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _IsEnabled() { }
 #endif
 
-#if __ANDROID__ || __IOS__ || __WINDOWS__
+#if __ANDROID__ || __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _Rotation() { }
 
@@ -74,7 +74,7 @@ public override void _TranslationX() { }
 		public override void _TranslationY() { }
 #endif
 
-#if __IOS__ || __WINDOWS__
+#if __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _Scale() { }
 #endif
diff --git a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/TimePickerUITests.cs b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/TimePickerUITests.cs
index 785225f67137..b0fb9bbc0b98 100644
--- a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/TimePickerUITests.cs
+++ b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/TimePickerUITests.cs
@@ -1,6 +1,6 @@
 using System.Threading;
-using NUnit.Framework;
 using Microsoft.Maui.Controls.CustomAttributes;
+using NUnit.Framework;
 
 namespace Microsoft.Maui.Controls.Compatibility.UITests
 {
@@ -53,12 +53,12 @@ protected override void FixtureTeardown()
 		public override void _Opacity() { }
 #endif
 
-#if __ANDROID__ || __IOS__ || __WINDOWS__
+#if __ANDROID__ || __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _IsEnabled() { }
 #endif
 
-#if __ANDROID__ || __IOS__ || __WINDOWS__
+#if __ANDROID__ || __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _Rotation() { }
 
@@ -77,7 +77,7 @@ public override void _TranslationX() { }
 		public override void _TranslationY() { }
 #endif
 
-#if __IOS__ || __WINDOWS__
+#if __IOS__ || WINDOWS
 		[Ignore("This is covered by the platform tests")]
 		public override void _Scale() { }
 #endif
diff --git a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/ToolbarItemTests.cs b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/ToolbarItemTests.cs
index c2a04459d0a8..38a55b7b01ca 100644
--- a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/ToolbarItemTests.cs
+++ b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/ToolbarItemTests.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Linq;
 using System.Threading;
-using NUnit.Framework;
 using Microsoft.Maui.Controls.Compatibility.ControlGallery;
 using Microsoft.Maui.Controls.CustomAttributes;
+using NUnit.Framework;
 using Xamarin.UITest;
 using Xamarin.UITest.Queries;
 
diff --git a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/ViewUITests.cs b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/ViewUITests.cs
index fc5c149c0786..43001c911c50 100644
--- a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/ViewUITests.cs
+++ b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/ViewUITests.cs
@@ -1,7 +1,7 @@
 
-using NUnit.Framework;
 using Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues;
 using Microsoft.Maui.Controls.CustomAttributes;
+using NUnit.Framework;
 
 namespace Microsoft.Maui.Controls.Compatibility.UITests
 {
@@ -127,7 +127,7 @@ public virtual void _Opacity()
 			remote.GoTo();
 #if __MACOS__
 			Assert.Inconclusive("needs testing");
-#elif __WINDOWS__
+#elif WINDOWS
 			Assert.Inconclusive(PleaseInspect);
 #else
 			float opacity = -1f;
@@ -154,7 +154,7 @@ public virtual void _Rotation()
 			Matrix generatedMatrix = NumericExtensions.CalculateRotationMatrixForDegrees(10, Axis.Z);
 			Assert.AreEqual(generatedMatrix, rotationMatrix);
 #endif
-#if __WINDOWS__
+#if WINDOWS
 			Assert.Inconclusive(PleaseInspect);
 #endif
 		}
@@ -176,7 +176,7 @@ public virtual void _RotationX()
 			Matrix matrix = NumericExtensions.CalculateRotationMatrixForDegrees(33.0f, Axis.X);
 			Assert.AreEqual(matrix, rotationXMatrix);
 #endif
-#if __WINDOWS__
+#if WINDOWS
 			Assert.Inconclusive(PleaseInspect);
 #endif
 		}
@@ -198,7 +198,7 @@ public virtual void _RotationY()
 			Matrix matrix = NumericExtensions.CalculateRotationMatrixForDegrees(10.0f, Axis.Y);
 			Assert.AreEqual(matrix, rotationYMatrix);
 #endif
-#if __WINDOWS__
+#if WINDOWS
 			Assert.Inconclusive(PleaseInspect);
 #endif
 		}
@@ -213,7 +213,7 @@ public virtual void _Scale()
 #if __MACOS__
 			Assert.Inconclusive("needs testing");
 #else
-#if __WINDOWS__
+#if WINDOWS
 			Assert.Inconclusive(PleaseInspect);
 #endif
 			var scaleMatrix = remote.GetProperty<Matrix>(View.ScaleProperty);
@@ -230,7 +230,7 @@ public virtual void _TranslationX()
 		{
 			var remote = new ViewContainerRemote(App, Test.VisualElement.TranslationX, PlatformViewType);
 			remote.GoTo();
-#if __WINDOWS__
+#if WINDOWS
 			Assert.Inconclusive(PleaseInspect);
 #endif
 		}
@@ -243,7 +243,7 @@ public virtual void _TranslationY()
 		{
 			var remote = new ViewContainerRemote(App, Test.VisualElement.TranslationY, PlatformViewType);
 			remote.GoTo();
-#if __WINDOWS__
+#if WINDOWS
 			Assert.Inconclusive(PleaseInspect);
 #endif
 		}
diff --git a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/WebViewUITests.cs b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/WebViewUITests.cs
index a4d2584742b6..e11884e10cbb 100644
--- a/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/WebViewUITests.cs
+++ b/src/Compatibility/ControlGallery/src/UITests.Shared/Tests/WebViewUITests.cs
@@ -1,5 +1,5 @@
-using NUnit.Framework;
 using Microsoft.Maui.Controls.CustomAttributes;
+using NUnit.Framework;
 
 namespace Microsoft.Maui.Controls.Compatibility.UITests
 {
diff --git a/src/Compatibility/ControlGallery/src/UITests.Shared/Utilities/AppExtensions.cs b/src/Compatibility/ControlGallery/src/UITests.Shared/Utilities/AppExtensions.cs
index 5f0e86729333..82086bc960a0 100644
--- a/src/Compatibility/ControlGallery/src/UITests.Shared/Utilities/AppExtensions.cs
+++ b/src/Compatibility/ControlGallery/src/UITests.Shared/Utilities/AppExtensions.cs
@@ -1,12 +1,11 @@
 using System;
 using System.Linq;
-
-using Xamarin.UITest;
-using Xamarin.UITest.Queries;
 using System.Text.RegularExpressions;
 using System.Threading;
 using Microsoft.Maui.Controls.Compatibility.ControlGallery;
 using Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues;
+using Xamarin.UITest;
+using Xamarin.UITest.Queries;
 
 #if __IOS__
 using Xamarin.UITest.iOS;
@@ -17,7 +16,7 @@ namespace Microsoft.Maui.Controls.Compatibility.UITests
 	using IApp = global::Xamarin.UITest.IApp;
 	internal static class AppExtensions
 	{
-#if __WINDOWS__
+#if WINDOWS
 		public static void Restart(this IApp app)
 		{
 			((ScreenshotConditionalApp)app).Restart();
@@ -25,7 +24,7 @@ public static void Restart(this IApp app)
 #endif
 		public static bool RestartIfAppIsClosed(this IApp app)
 		{
-#if __WINDOWS__
+#if WINDOWS
 			return ((ScreenshotConditionalApp)app).RestartIfAppIsClosed();
 #else
 			return false;
@@ -165,7 +164,7 @@ public static void SendAppToBackground(this IApp app, TimeSpan timeSpan)
 
 		public static string ReadDatePicker(this IApp app, string marked)
 		{
-#if __WINDOWS__
+#if WINDOWS
 			return ((ScreenshotConditionalApp)app).ReadDatePicker(marked).ToString();
 #else
 			return app.WaitForElement(marked)[0].ReadText();
@@ -174,7 +173,7 @@ public static string ReadDatePicker(this IApp app, string marked)
 
 		public static string ReadTimePicker(this IApp app, string marked)
 		{
-#if __WINDOWS__
+#if WINDOWS
 			return ((ScreenshotConditionalApp)app).ReadTimePicker(marked).ToString();
 #else
 			return app.WaitForElement(marked)[0].ReadText();
diff --git a/src/Compatibility/ControlGallery/src/UITests.Shared/Utilities/Gestures.cs b/src/Compatibility/ControlGallery/src/UITests.Shared/Utilities/Gestures.cs
index 42bbdda9717d..fe4075399870 100644
--- a/src/Compatibility/ControlGallery/src/UITests.Shared/Utilities/Gestures.cs
+++ b/src/Compatibility/ControlGallery/src/UITests.Shared/Utilities/Gestures.cs
@@ -108,7 +108,7 @@ public static void ActivateContextMenu(this IApp app, string target)
 				rect.CenterY);
 #elif __ANDROID__
 			app.TouchAndHold(target);
-#elif __WINDOWS__
+#elif WINDOWS
 			// Since we know we're on desktop for the moment, just use ContextClick. If we get this running
 			// on actual touch devices at some point, we'll need to check for that and use TouchAndHold
 			app.Invoke("ContextClick", target);
@@ -123,9 +123,9 @@ public static void DismissContextMenu(this IApp app)
 			app.TapCoordinates(screenbounds.CenterX, screenbounds.CenterY);
 #elif __ANDROID__
 			app.Back();
-#elif __WINDOWS__
+#elif WINDOWS
 			var screenbounds = app.RootViewRect();
-			app.TapCoordinates (screenbounds.CenterX, screenbounds.CenterY);
+			app.TapCoordinates(screenbounds.CenterX, screenbounds.CenterY);
 #endif
 		}
 	}
diff --git a/src/Compatibility/ControlGallery/src/WinUI (Package)/Compatibility.ControlGallery.WinUI (Package).wapproj b/src/Compatibility/ControlGallery/src/WinUI (Package)/Compatibility.ControlGallery.WinUI (Package).wapproj
index d4b45e30851a..76f80ffbfab3 100644
--- a/src/Compatibility/ControlGallery/src/WinUI (Package)/Compatibility.ControlGallery.WinUI (Package).wapproj	
+++ b/src/Compatibility/ControlGallery/src/WinUI (Package)/Compatibility.ControlGallery.WinUI (Package).wapproj	
@@ -3,9 +3,6 @@
   <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0'">
     <VisualStudioVersion>15.0</VisualStudioVersion>
   </PropertyGroup>
-  <PropertyGroup>
-    <SkipImportNetSdk>true</SkipImportNetSdk>
-  </PropertyGroup>
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x86">
       <Configuration>Debug</Configuration>
diff --git a/src/Compatibility/ControlGallery/src/WinUI/App.xaml.cs b/src/Compatibility/ControlGallery/src/WinUI/App.xaml.cs
index 0d8013e51fd2..45c82d7deb6e 100644
--- a/src/Compatibility/ControlGallery/src/WinUI/App.xaml.cs
+++ b/src/Compatibility/ControlGallery/src/WinUI/App.xaml.cs
@@ -3,11 +3,6 @@
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
-using Windows.Foundation.Metadata;
-using Windows.UI;
-using Windows.UI.ViewManagement;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Controls.Primitives;
@@ -16,27 +11,32 @@
 using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Navigation;
 using Windows.ApplicationModel;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.Foundation.Metadata;
+using Windows.UI;
+using Windows.UI.ViewManagement;
 
 // The Blank Application template is documented at http://go.microsoft.com/fwlink/?LinkId=402347&clcid=0x409
 
 namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI
 {
-    /// <summary>
-    /// Provides application-specific behavior to supplement the default Application class.
-    /// </summary>
-    sealed partial class App : Microsoft.UI.Xaml.Application
+	/// <summary>
+	/// Provides application-specific behavior to supplement the default Application class.
+	/// </summary>
+	sealed partial class App : Microsoft.UI.Xaml.Application
 	{
-		private Window m_window;
+		private UI.Xaml.Window m_window;
 		public static bool RunningAsUITests { get; private set; }
 		/// <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();
-            //Suspending += OnSuspending;
-        }
+		{
+			InitializeComponent();
+			//Suspending += OnSuspending;
+		}
 
 		/// <summary>
 		/// Invoked when the application is launched normally by the end user.  Other entry points
@@ -44,8 +44,8 @@ public App()
 		/// </summary>
 		/// <param name="e">Details about the launch request and process.</param>
 		protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs e)
-        {
-            if (!String.IsNullOrWhiteSpace(e.Arguments) &&
+		{
+			if (!String.IsNullOrWhiteSpace(e.Arguments) &&
 				e.Arguments.Contains("RunningAsUITests"))
 			{
 				RunningAsUITests = true;
@@ -56,28 +56,28 @@ protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs e)
 			Maui.Controls.Compatibility.Forms.Init(e, m_window as MainPage);
 		}
 
-        /// <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 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>
-        void OnSuspending(object sender, SuspendingEventArgs e)
-        {
-            var deferral = e.SuspendingOperation.GetDeferral();
-            //TODO: Save application state and stop any background activity
-            deferral.Complete();
-        }
-    }
+		/// <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>
+		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/Compatibility/ControlGallery/src/WinUI/AttachedStateEffectRenderer.cs b/src/Compatibility/ControlGallery/src/WinUI/AttachedStateEffectRenderer.cs
index e7a433a2e342..43b6b4bc4b5f 100644
--- a/src/Compatibility/ControlGallery/src/WinUI/AttachedStateEffectRenderer.cs
+++ b/src/Compatibility/ControlGallery/src/WinUI/AttachedStateEffectRenderer.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Linq;
 using Microsoft.Maui.Controls;
-using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI;
 using Microsoft.Maui.Controls.Compatibility.ControlGallery.Effects;
+using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI;
 using Microsoft.Maui.Controls.Compatibility.Platform.UWP;
 
 [assembly: ExportEffect(typeof(AttachedStateEffectRenderer), AttachedStateEffect.EffectName)]
diff --git a/src/Compatibility/ControlGallery/src/WinUI/BorderEffect.cs b/src/Compatibility/ControlGallery/src/WinUI/BorderEffect.cs
index cc3296f2de71..3f905b87f111 100644
--- a/src/Compatibility/ControlGallery/src/WinUI/BorderEffect.cs
+++ b/src/Compatibility/ControlGallery/src/WinUI/BorderEffect.cs
@@ -1,8 +1,8 @@
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.Maui.Controls;
+using Microsoft.Maui.Controls;
 using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI;
 using Microsoft.Maui.Controls.Compatibility.Platform.UWP;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media;
 
 [assembly: ExportEffect(typeof(BorderEffect), "BorderEffect")]
 namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI
diff --git a/src/Compatibility/ControlGallery/src/WinUI/BrokenImageSourceHandler.cs b/src/Compatibility/ControlGallery/src/WinUI/BrokenImageSourceHandler.cs
index 17d49da71e0b..ab507fc5c220 100644
--- a/src/Compatibility/ControlGallery/src/WinUI/BrokenImageSourceHandler.cs
+++ b/src/Compatibility/ControlGallery/src/WinUI/BrokenImageSourceHandler.cs
@@ -2,10 +2,10 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues;
-using WImageSource = Microsoft.UI.Xaml.Media.ImageSource;
-
-using Microsoft.Maui.Controls.Compatibility.Platform.UWP;
 using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI;
+using Microsoft.Maui.Controls.Compatibility.Platform.UWP;
+using Microsoft.Maui.Controls.Platform;
+using WImageSource = Microsoft.UI.Xaml.Media.ImageSource;
 
 [assembly: ExportRenderer(typeof(_51173Image), typeof(_51173CustomImageRenderer))]
 namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI
diff --git a/src/Compatibility/ControlGallery/src/WinUI/BrokenNativeControl.cs b/src/Compatibility/ControlGallery/src/WinUI/BrokenNativeControl.cs
index 6b607de6b268..c95f6fdf9f66 100644
--- a/src/Compatibility/ControlGallery/src/WinUI/BrokenNativeControl.cs
+++ b/src/Compatibility/ControlGallery/src/WinUI/BrokenNativeControl.cs
@@ -1,19 +1,20 @@
+using Microsoft.UI;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media;
 using Windows.Foundation;
 using Windows.Graphics.Display;
 using Windows.UI;
 using Windows.UI.ViewManagement;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI;
 
 namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI
 {
 	internal class BrokenNativeControl : Panel
 	{
-		public BrokenNativeControl ()
+		public BrokenNativeControl()
 		{
-			_textBlock = new TextBlock {
+			_textBlock = new TextBlock
+			{
 				MinHeight = 0,
 				MaxHeight = double.PositiveInfinity,
 				MinWidth = 0,
@@ -22,17 +23,17 @@ public BrokenNativeControl ()
 				HorizontalAlignment = HorizontalAlignment.Center
 			};
 
-			Children.Add (_textBlock);
+			Children.Add(_textBlock);
 
 			Background =
-				new Microsoft.UI.Xaml.Media.LinearGradientBrush (
-					new Microsoft.UI.Xaml.Media.GradientStopCollection { new Microsoft.UI.Xaml.Media.GradientStop { Color = Colors.Green, Offset = 0.5}, new Microsoft.UI.Xaml.Media.GradientStop { Color = Colors.Blue, Offset = 1} }, 0);
+				new Microsoft.UI.Xaml.Media.LinearGradientBrush(
+					new Microsoft.UI.Xaml.Media.GradientStopCollection { new Microsoft.UI.Xaml.Media.GradientStop { Color = Colors.Green, Offset = 0.5 }, new Microsoft.UI.Xaml.Media.GradientStop { Color = Colors.Blue, Offset = 1 } }, 0);
 		}
 
-		public static readonly DependencyProperty TextProperty = DependencyProperty.Register (
-			"Text", typeof(string), typeof(BrokenNativeControl), new PropertyMetadata (default(string), PropertyChangedCallback));
+		public static readonly DependencyProperty TextProperty = DependencyProperty.Register(
+			"Text", typeof(string), typeof(BrokenNativeControl), new PropertyMetadata(default(string), PropertyChangedCallback));
 
-		static void PropertyChangedCallback (DependencyObject dependencyObject,
+		static void PropertyChangedCallback(DependencyObject dependencyObject,
 			DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
 		{
 			((BrokenNativeControl)dependencyObject)._textBlock.Text = (string)dependencyPropertyChangedEventArgs.NewValue;
@@ -40,8 +41,8 @@ static void PropertyChangedCallback (DependencyObject dependencyObject,
 
 		public string Text
 		{
-			get { return (string)GetValue (TextProperty); }
-			set { SetValue (TextProperty, value); }
+			get { return (string)GetValue(TextProperty); }
+			set { SetValue(TextProperty, value); }
 		}
 
 		readonly TextBlock _textBlock;
@@ -53,16 +54,16 @@ protected override Windows.Foundation.Size ArrangeOverride(Windows.Foundation.Si
 		}
 
 
-		protected override global::Windows.Foundation.Size  MeasureOverride (Windows.Foundation.Size availableSize)
+		protected override global::Windows.Foundation.Size MeasureOverride(Windows.Foundation.Size availableSize)
 		{
-			_textBlock.Measure (availableSize);
+			_textBlock.Measure(availableSize);
 
 			// This deliberately does something wrong so we can demo fixing it
-			var bounds = ApplicationView.GetForCurrentView ().VisibleBounds;
-			double scaleFactor = DisplayInformation.GetForCurrentView ().RawPixelsPerViewPixel;
-			var size = new Size (bounds.Width * scaleFactor, bounds.Height * scaleFactor);
+			var bounds = ApplicationView.GetForCurrentView().VisibleBounds;
+			double scaleFactor = DisplayInformation.GetForCurrentView().RawPixelsPerViewPixel;
+			var size = new Size(bounds.Width * scaleFactor, bounds.Height * scaleFactor);
 
-			return new Windows.Foundation.Size (size.Width, _textBlock.DesiredSize.Height);
+			return new Windows.Foundation.Size(size.Width, _textBlock.DesiredSize.Height);
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/src/WinUI/CustomRenderers.cs b/src/Compatibility/ControlGallery/src/WinUI/CustomRenderers.cs
index 923d65d8786b..53373a8c3609 100644
--- a/src/Compatibility/ControlGallery/src/WinUI/CustomRenderers.cs
+++ b/src/Compatibility/ControlGallery/src/WinUI/CustomRenderers.cs
@@ -2,15 +2,16 @@
 using System.ComponentModel;
 using System.Linq;
 using Microsoft.Maui;
+using Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues;
+using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI;
 using Microsoft.Maui.Controls.Compatibility.Platform.UWP;
+using Microsoft.Maui.Controls.Platform;
+using Microsoft.Maui.Graphics;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
 using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Shapes;
-using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI;
-using Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues;
-using Microsoft.Maui.Graphics;
 
 [assembly: ExportRenderer(typeof(Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues.Bugzilla42602.TextBoxView), typeof(Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI.TextBoxViewRenderer))]
 [assembly: ExportRenderer(typeof(Issue1683.EntryKeyboardFlags), typeof(EntryRendererKeyboardFlags))]
@@ -65,7 +66,8 @@ public static class KeyboardFlagExtensions
 	{
 		public static void TestKeyboardFlags(this FormsTextBox Control, KeyboardFlags? flags)
 		{
-			if (flags == null) { return; }
+			if (flags == null)
+			{ return; }
 			if (flags.Value.HasFlag(KeyboardFlags.CapitalizeSentence))
 			{
 				if (!Control.IsSpellCheckEnabled)
@@ -94,7 +96,8 @@ public static void TestKeyboardFlags(this FormsTextBox Control, KeyboardFlags? f
 
 		public static void SetKeyboardFlags(this FormsTextBox Control, KeyboardFlags? flags)
 		{
-			if (flags == null) { return; }
+			if (flags == null)
+			{ return; }
 			var result = new InputScope();
 			var value = InputScopeNameValue.Default;
 
diff --git a/src/Compatibility/ControlGallery/src/WinUI/CustomSwitchRenderer.cs b/src/Compatibility/ControlGallery/src/WinUI/CustomSwitchRenderer.cs
index e79d9fc84e0d..6eabb356bee5 100644
--- a/src/Compatibility/ControlGallery/src/WinUI/CustomSwitchRenderer.cs
+++ b/src/Compatibility/ControlGallery/src/WinUI/CustomSwitchRenderer.cs
@@ -1,9 +1,10 @@
 using System.ComponentModel;
-using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI;
 using Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues;
+using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI;
 using Microsoft.Maui.Controls.Compatibility.Platform.UWP;
-using WResourceDictionary = Microsoft.UI.Xaml.ResourceDictionary;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
+using WResourceDictionary = Microsoft.UI.Xaml.ResourceDictionary;
 
 [assembly: ExportRenderer(typeof(CustomSwitch), typeof(CustomSwitchRenderer))]
 namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI
diff --git a/src/Compatibility/ControlGallery/src/WinUI/DisposePageRenderer.cs b/src/Compatibility/ControlGallery/src/WinUI/DisposePageRenderer.cs
index 8c64b51d16bf..1ddcda2aaa79 100644
--- a/src/Compatibility/ControlGallery/src/WinUI/DisposePageRenderer.cs
+++ b/src/Compatibility/ControlGallery/src/WinUI/DisposePageRenderer.cs
@@ -1,6 +1,6 @@
+using Microsoft.Maui.Controls.Compatibility.ControlGallery;
 using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI;
 using Microsoft.Maui.Controls.Compatibility.Platform.UWP;
-using Microsoft.Maui.Controls.Compatibility.ControlGallery;
 
 [assembly: ExportRenderer(typeof(DisposePage), typeof(DisposePageRenderer))]
 [assembly: ExportRenderer(typeof(DisposeLabel), typeof(DisposeLabelRenderer))]
diff --git a/src/Compatibility/ControlGallery/src/WinUI/FocusEffect.cs b/src/Compatibility/ControlGallery/src/WinUI/FocusEffect.cs
index 5e0a99f1ce23..f69fa91ac690 100644
--- a/src/Compatibility/ControlGallery/src/WinUI/FocusEffect.cs
+++ b/src/Compatibility/ControlGallery/src/WinUI/FocusEffect.cs
@@ -4,12 +4,12 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Windows.UI;
-using Microsoft.UI.Xaml.Media;
 using Microsoft.Maui.Controls;
 using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI;
 using Microsoft.Maui.Controls.Compatibility.Platform.UWP;
 using Microsoft.UI;
+using Microsoft.UI.Xaml.Media;
+using Windows.UI;
 
 [assembly: ExportEffect(typeof(FocusEffect), "FocusEffect")]
 namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI
diff --git a/src/Compatibility/ControlGallery/src/WinUI/MainPage.xaml.cs b/src/Compatibility/ControlGallery/src/WinUI/MainPage.xaml.cs
index f5ad33f7eed9..44566d44233c 100644
--- a/src/Compatibility/ControlGallery/src/WinUI/MainPage.xaml.cs
+++ b/src/Compatibility/ControlGallery/src/WinUI/MainPage.xaml.cs
@@ -2,6 +2,12 @@
 
 using System;
 using System.Globalization;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Controls.Compatibility.ControlGallery;
+using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI;
+using Microsoft.Maui.Controls.Compatibility.Platform.UWP;
+using Microsoft.Maui.Controls.Platform;
+using Microsoft.Maui.Graphics;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
@@ -10,11 +16,6 @@
 using Windows.System;
 using Windows.UI.Core;
 using Windows.UI.ViewManagement;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI;
-using Microsoft.Maui.Controls.Compatibility.ControlGallery;
-using Microsoft.Maui.Controls.Compatibility.Platform.UWP;
-using Microsoft.Maui.Graphics;
 
 namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI
 {
@@ -78,7 +79,7 @@ void WireUpKeyDown()
 				}
 			});
 		}
-		
+
 		private void _app_PropertyChanged(object sender, global::System.ComponentModel.PropertyChangedEventArgs e)
 		{
 			if (e.PropertyName == "MainPage")
diff --git a/src/Compatibility/ControlGallery/src/WinUI/NavPageOverrideRenderer.cs b/src/Compatibility/ControlGallery/src/WinUI/NavPageOverrideRenderer.cs
index a771bff79e05..bfa1ef8eb178 100644
--- a/src/Compatibility/ControlGallery/src/WinUI/NavPageOverrideRenderer.cs
+++ b/src/Compatibility/ControlGallery/src/WinUI/NavPageOverrideRenderer.cs
@@ -1,9 +1,10 @@
-using Microsoft.UI.Xaml.Media.Animation;
-using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI;
+using Microsoft.Maui.Controls;
 using Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues;
-using Microsoft.Maui.Controls;
+using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI;
 using Microsoft.Maui.Controls.Compatibility.Platform.UWP;
 using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Controls.Platform;
+using Microsoft.UI.Xaml.Media.Animation;
 
 [assembly: ExportRenderer(typeof(NavPageOverrideUWP.CustomNavPageForOverride), typeof(NavPageOverrideRenderer))]
 namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI
@@ -20,7 +21,7 @@ protected override void OnElementChanged(VisualElementChangedEventArgs e)
 
 		protected override void SetupPageTransition(Transition transition, bool isAnimated, bool isPopping)
 		{
-			var newTransition = new EntranceThemeTransition { FromVerticalOffset = 0};
+			var newTransition = new EntranceThemeTransition { FromVerticalOffset = 0 };
 
 			if (isPopping)
 			{
diff --git a/src/Compatibility/ControlGallery/src/WinUI/PlatformSpecificCoreGalleryFactory.cs b/src/Compatibility/ControlGallery/src/WinUI/PlatformSpecificCoreGalleryFactory.cs
index 56573bd1cd3c..de127a326ac6 100644
--- a/src/Compatibility/ControlGallery/src/WinUI/PlatformSpecificCoreGalleryFactory.cs
+++ b/src/Compatibility/ControlGallery/src/WinUI/PlatformSpecificCoreGalleryFactory.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.Maui.Controls;
-using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI;
 using Microsoft.Maui.Controls.Compatibility.ControlGallery;
+using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI;
 
 [assembly: Dependency(typeof(PlatformSpecificCoreGalleryFactory))]
 
diff --git a/src/Compatibility/ControlGallery/src/WinUI/Properties/AssemblyInfo.cs b/src/Compatibility/ControlGallery/src/WinUI/Properties/AssemblyInfo.cs
index 6fc94401cb88..c9c71ef677c6 100644
--- a/src/Compatibility/ControlGallery/src/WinUI/Properties/AssemblyInfo.cs
+++ b/src/Compatibility/ControlGallery/src/WinUI/Properties/AssemblyInfo.cs
@@ -2,10 +2,10 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using Microsoft.Maui.Controls;
-using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI;
 using Microsoft.Maui.Controls.Compatibility.ControlGallery;
+using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI;
 using Microsoft.Maui.Controls.Compatibility.Platform.UWP;
 
 // Deliberately broken image source and handler so we can test handling of image loading errors
 [assembly: ExportImageSourceHandler(typeof(FailImageSource), typeof(BrokenImageSourceHandler))]
-[assembly: Microsoft.Maui.Controls.ResolutionGroupName (Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues.Effects.ResolutionGroupName)]
\ No newline at end of file
+[assembly: Microsoft.Maui.Controls.ResolutionGroupName(Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues.Effects.ResolutionGroupName)]
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/src/WinUI/RegistrarValidationService.cs b/src/Compatibility/ControlGallery/src/WinUI/RegistrarValidationService.cs
index bb7d7bc2efd2..92c1b40f6b2e 100644
--- a/src/Compatibility/ControlGallery/src/WinUI/RegistrarValidationService.cs
+++ b/src/Compatibility/ControlGallery/src/WinUI/RegistrarValidationService.cs
@@ -1,6 +1,6 @@
 using Microsoft.Maui.Controls;
-using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI;
 using Microsoft.Maui.Controls.Compatibility.ControlGallery;
+using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI;
 using Microsoft.Maui.Controls.Compatibility.Platform.UWP;
 
 [assembly: Dependency(typeof(RegistrarValidationService))]
@@ -17,7 +17,7 @@ public bool Validate(VisualElement element, out string message)
 
 			var renderer = Platform.UWP.Platform.CreateRenderer(element);
 
-			if (renderer == null 
+			if (renderer == null
 				|| renderer.GetType().Name == "DefaultRenderer"
 				)
 			{
diff --git a/src/Compatibility/ControlGallery/src/WinUI/SampleNativeControl.cs b/src/Compatibility/ControlGallery/src/WinUI/SampleNativeControl.cs
index 61085eb91bb4..b2b603d4cffa 100644
--- a/src/Compatibility/ControlGallery/src/WinUI/SampleNativeControl.cs
+++ b/src/Compatibility/ControlGallery/src/WinUI/SampleNativeControl.cs
@@ -1,10 +1,10 @@
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI;
+using Microsoft.Maui.Controls;
 using Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues.Helpers;
+using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI;
 using Microsoft.Maui.Controls.Compatibility.Platform.UWP;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media;
 
 [assembly: Dependency(typeof(SampleNativeControl))]
 namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI
diff --git a/src/Compatibility/ControlGallery/src/WinUI/SecondaryWindowService.cs b/src/Compatibility/ControlGallery/src/WinUI/SecondaryWindowService.cs
index 63ddaf52d8f3..9058ec3fa803 100644
--- a/src/Compatibility/ControlGallery/src/WinUI/SecondaryWindowService.cs
+++ b/src/Compatibility/ControlGallery/src/WinUI/SecondaryWindowService.cs
@@ -1,13 +1,13 @@
 using System;
 using System.Threading.Tasks;
-using Windows.ApplicationModel.Core;
-using Windows.UI.Core;
-using Windows.UI.ViewManagement;
-using Microsoft.UI.Xaml;
 using Microsoft.Maui.Controls;
-using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI;
 using Microsoft.Maui.Controls.Compatibility.ControlGallery;
+using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI;
 using Microsoft.Maui.Controls.Compatibility.Platform.UWP;
+using Microsoft.UI.Xaml;
+using Windows.ApplicationModel.Core;
+using Windows.UI.Core;
+using Windows.UI.ViewManagement;
 
 [assembly: Dependency(typeof(SecondaryWindowService))]
 namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI
@@ -25,8 +25,8 @@ await newView.Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
 				//The page instance must be created inside the new UI Thread.
 				ContentPage instance = (ContentPage)Activator.CreateInstance(pageType);
 				frame.Navigate(instance);
-				Window.Current.Content = frame;
-				Window.Current.Activate();
+				UI.Xaml.Window.Current.Content = frame;
+				UI.Xaml.Window.Current.Activate();
 
 				newViewId = ApplicationView.GetForCurrentView().Id;
 			});
diff --git a/src/Compatibility/ControlGallery/src/WinUI/Tests/PlatformTestSettings.cs b/src/Compatibility/ControlGallery/src/WinUI/Tests/PlatformTestSettings.cs
index f1827621638b..4364f438f643 100644
--- a/src/Compatibility/ControlGallery/src/WinUI/Tests/PlatformTestSettings.cs
+++ b/src/Compatibility/ControlGallery/src/WinUI/Tests/PlatformTestSettings.cs
@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using System.Reflection;
-using NUnit;
 using Microsoft.Maui.Controls;
-using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI.Tests;
 using Microsoft.Maui.Controls.Compatibility.ControlGallery.Tests;
+using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI.Tests;
+using NUnit;
 
 [assembly: Dependency(typeof(PlatformTestSettings))]
 namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI.Tests
diff --git a/src/Compatibility/ControlGallery/src/WinUI/Tests/TestingPlatformService.cs b/src/Compatibility/ControlGallery/src/WinUI/Tests/TestingPlatformService.cs
index b010de89e6b0..d2e0f5f9cee3 100644
--- a/src/Compatibility/ControlGallery/src/WinUI/Tests/TestingPlatformService.cs
+++ b/src/Compatibility/ControlGallery/src/WinUI/Tests/TestingPlatformService.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using Microsoft.Maui.Controls;
-using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI.Tests;
 using Microsoft.Maui.Controls.Compatibility.ControlGallery.Tests;
+using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI.Tests;
 
 [assembly: Dependency(typeof(TestingPlatformService))]
 namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI.Tests
diff --git a/src/Compatibility/ControlGallery/src/WinUI/_13109IssueHelper.cs b/src/Compatibility/ControlGallery/src/WinUI/_13109IssueHelper.cs
index 6f4499553c61..964676cde79d 100644
--- a/src/Compatibility/ControlGallery/src/WinUI/_13109IssueHelper.cs
+++ b/src/Compatibility/ControlGallery/src/WinUI/_13109IssueHelper.cs
@@ -1,8 +1,9 @@
 using System.Threading.Tasks;
 using Microsoft.Maui.Controls;
-using Microsoft.Maui.Controls.Compatibility.Platform.UWP;
 using Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues;
 using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI;
+using Microsoft.Maui.Controls.Compatibility.Platform.UWP;
+using Microsoft.Maui.Controls.Platform;
 using Bitmap = Microsoft.UI.Xaml.Media.ImageSource;
 
 [assembly: Dependency(typeof(_13109IssueHelper))]
@@ -29,4 +30,4 @@ internal static Task<Bitmap> GetImage(this ImageSource source)
 			return source.GetHandler().LoadImageAsync(source);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Compatibility/ControlGallery/src/WinUI/_2489CustomRenderer.cs b/src/Compatibility/ControlGallery/src/WinUI/_2489CustomRenderer.cs
index 994ccd5979ea..dfbc5f7b0fdd 100644
--- a/src/Compatibility/ControlGallery/src/WinUI/_2489CustomRenderer.cs
+++ b/src/Compatibility/ControlGallery/src/WinUI/_2489CustomRenderer.cs
@@ -3,6 +3,7 @@
 using Microsoft.Maui.Controls;
 using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI;
 using Microsoft.Maui.Controls.Compatibility.Platform.UWP;
+using Microsoft.Maui.Controls.Platform;
 
 [assembly: ExportRenderer(typeof(Microsoft.Maui.Controls.Page), typeof(_2489CustomRenderer))]
 namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI
diff --git a/src/Compatibility/ControlGallery/src/WinUI/_57114Renderer.cs b/src/Compatibility/ControlGallery/src/WinUI/_57114Renderer.cs
index fa159f262fb6..6e972e97c411 100644
--- a/src/Compatibility/ControlGallery/src/WinUI/_57114Renderer.cs
+++ b/src/Compatibility/ControlGallery/src/WinUI/_57114Renderer.cs
@@ -1,9 +1,10 @@
-using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI;
 using Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues;
+using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI;
 using Microsoft.Maui.Controls.Compatibility.Platform.UWP;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
 
 [assembly: ExportRenderer(typeof(Bugzilla57114._57114View), typeof(_57114Renderer))]
 
@@ -17,7 +18,7 @@ protected override void OnElementChanged(ElementChangedEventArgs<Bugzilla57114._
 			{
 				var view = new _57114NativeView();
 				SetNativeControl(view);
-				
+
 			}
 
 			base.OnElementChanged(e);
diff --git a/src/Compatibility/ControlGallery/src/WinUI/_58406EffectRenderer.cs b/src/Compatibility/ControlGallery/src/WinUI/_58406EffectRenderer.cs
index 3975f4dbc991..10e84a8155c0 100644
--- a/src/Compatibility/ControlGallery/src/WinUI/_58406EffectRenderer.cs
+++ b/src/Compatibility/ControlGallery/src/WinUI/_58406EffectRenderer.cs
@@ -1,8 +1,8 @@
 using System.Linq;
-using Microsoft.UI.Xaml.Controls;
 using Microsoft.Maui.Controls;
 using Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues;
 using Microsoft.Maui.Controls.Compatibility.Platform.UWP;
+using Microsoft.UI.Xaml.Controls;
 
 [assembly: ExportEffect(typeof(Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI._58406EffectRenderer), Bugzilla58406.EffectName)]
 
@@ -19,7 +19,7 @@ protected override void OnAttached()
 				return;
 			}
 
-			textBlock.Text = new string(textBlock.Text.ToCharArray().Reverse().ToArray()); 
+			textBlock.Text = new string(textBlock.Text.ToCharArray().Reverse().ToArray());
 		}
 
 		protected override void OnDetached()
diff --git a/src/Compatibility/ControlGallery/src/WinUI/_60122ImageRenderer.cs b/src/Compatibility/ControlGallery/src/WinUI/_60122ImageRenderer.cs
index 4c47665f99d3..c0bbda4c7396 100644
--- a/src/Compatibility/ControlGallery/src/WinUI/_60122ImageRenderer.cs
+++ b/src/Compatibility/ControlGallery/src/WinUI/_60122ImageRenderer.cs
@@ -1,9 +1,10 @@
 using System;
-using Windows.UI.Input;
-using Microsoft.UI.Xaml.Input;
-using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI;
 using Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues;
+using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI;
 using Microsoft.Maui.Controls.Compatibility.Platform.UWP;
+using Microsoft.Maui.Controls.Platform;
+using Microsoft.UI.Xaml.Input;
+using Windows.UI.Input;
 
 [assembly: ExportRenderer(typeof(Bugzilla60122._60122Image), typeof(_60122ImageRenderer))]
 
@@ -21,7 +22,7 @@ protected override void OnElementChanged(ElementChangedEventArgs<Image> e)
 			if (e.NewElement != null)
 			{
 				_customControl = e.NewElement as Bugzilla60122._60122Image;
-				_gestureRecognizer.GestureSettings = GestureSettings.HoldWithMouse;         
+				_gestureRecognizer.GestureSettings = GestureSettings.HoldWithMouse;
 				Holding += OnHolding;
 			}
 			else
diff --git a/src/Compatibility/ControlGallery/src/WinUI/_9087CustomRenderer.cs b/src/Compatibility/ControlGallery/src/WinUI/_9087CustomRenderer.cs
index 9ae2b122fc22..3c1be43f7518 100644
--- a/src/Compatibility/ControlGallery/src/WinUI/_9087CustomRenderer.cs
+++ b/src/Compatibility/ControlGallery/src/WinUI/_9087CustomRenderer.cs
@@ -1,6 +1,7 @@
 using System;
 using Microsoft.Maui.Controls.Compatibility.ControlGallery.WinUI;
 using Microsoft.Maui.Controls.Compatibility.Platform.UWP;
+using Microsoft.Maui.Controls.Platform;
 using static Microsoft.Maui.Controls.Compatibility.ControlGallery.Issues.Issue9087;
 
 [assembly: ExportRenderer(typeof(_9087Label), typeof(_9087CustomRenderer))]
diff --git a/src/Compatibility/ControlGallery/test/WinUI.UITests/WinUI.UITests.csproj b/src/Compatibility/ControlGallery/test/WinUI.UITests/WinUI.UITests.csproj
index 23c9fabcc6fa..b7b9d2a2d44a 100644
--- a/src/Compatibility/ControlGallery/test/WinUI.UITests/WinUI.UITests.csproj
+++ b/src/Compatibility/ControlGallery/test/WinUI.UITests/WinUI.UITests.csproj
@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;__WINDOWS__;UITEST</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;WINDOWS;WINDOWS;UITEST</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <NoWarn>0114;0108;4014;0649;0169;0168;0219</NoWarn>
@@ -27,7 +27,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;__WINDOWS__;UITEST</DefineConstants>
+    <DefineConstants>TRACE;WINDOWS;UITEST</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <NoWarn>0114;0108;4014;0649;0169;0168;0219</NoWarn>
diff --git a/src/Compatibility/ControlGallery/test/WinUI.UITests/WindowsTestBase.cs b/src/Compatibility/ControlGallery/test/WinUI.UITests/WindowsTestBase.cs
index e97762e51f56..8f9d842978b6 100644
--- a/src/Compatibility/ControlGallery/test/WinUI.UITests/WindowsTestBase.cs
+++ b/src/Compatibility/ControlGallery/test/WinUI.UITests/WindowsTestBase.cs
@@ -31,12 +31,13 @@ public static void StartupApplication()
 		{
 			AppiumOptions options = new AppiumOptions();
 			options.AddAdditionalCapability("app", "0d4424f6-1e29-4476-ac00-ba22c3789cb6_ph1m9x8skttmg!App");
-			
+
 			try
 			{
 				Session = new WindowsDriver<WindowsElement>(new Uri(WindowsApplicationDriverUrl), options);
 			}
-			catch {
+			catch
+			{
 				// This crashes because it can't find the window but it will at least start the application
 			}
 		}
diff --git a/src/Compatibility/Core/src/Android/AppCompat/ButtonRenderer.cs b/src/Compatibility/Core/src/Android/AppCompat/ButtonRenderer.cs
index 38f358d62f75..bb490c37a558 100644
--- a/src/Compatibility/Core/src/Android/AppCompat/ButtonRenderer.cs
+++ b/src/Compatibility/Core/src/Android/AppCompat/ButtonRenderer.cs
@@ -171,7 +171,7 @@ void UpdateFont()
 			else
 			{
 				NativeButton.Typeface = font.ToTypeface();
-				NativeButton.SetTextSize(ComplexUnitType.Sp, font.ToScaledPixel());
+				NativeButton.SetTextSize(ComplexUnitType.Sp, (float)font.FontSize);
 			}
 		}
 
diff --git a/src/Compatibility/Core/src/Android/AppCompat/CarouselPageRenderer.cs b/src/Compatibility/Core/src/Android/AppCompat/CarouselPageRenderer.cs
index bcd402bfb51a..4624b4b3a614 100644
--- a/src/Compatibility/Core/src/Android/AppCompat/CarouselPageRenderer.cs
+++ b/src/Compatibility/Core/src/Android/AppCompat/CarouselPageRenderer.cs
@@ -4,6 +4,7 @@
 using Android.Views;
 using AndroidX.Fragment.App;
 using AndroidX.ViewPager.Widget;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.Android.AppCompat
diff --git a/src/Compatibility/Core/src/Android/AppCompat/CheckBoxRendererBase.cs b/src/Compatibility/Core/src/Android/AppCompat/CheckBoxRendererBase.cs
index dbaaec74a4ea..58413d15c224 100644
--- a/src/Compatibility/Core/src/Android/AppCompat/CheckBoxRendererBase.cs
+++ b/src/Compatibility/Core/src/Android/AppCompat/CheckBoxRendererBase.cs
@@ -9,6 +9,7 @@
 using AndroidX.Core.Widget;
 using Microsoft.Maui.Controls.Compatibility.Platform.Android.FastRenderers;
 using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
 using AAttribute = Android.Resource.Attribute;
 using AColor = Android.Graphics.Color;
diff --git a/src/Compatibility/Core/src/Android/AppCompat/FlyoutPageContainer.cs b/src/Compatibility/Core/src/Android/AppCompat/FlyoutPageContainer.cs
index 97dc44048d70..3ae89784ab46 100644
--- a/src/Compatibility/Core/src/Android/AppCompat/FlyoutPageContainer.cs
+++ b/src/Compatibility/Core/src/Android/AppCompat/FlyoutPageContainer.cs
@@ -4,6 +4,7 @@
 using Android.Views;
 using Microsoft.Maui.Controls.Compatibility.Platform.Android.AppCompat;
 using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
 using APlatform = Microsoft.Maui.Controls.Compatibility.Platform.Android.AppCompat.Platform;
 using Fragment = AndroidX.Fragment.App.Fragment;
diff --git a/src/Compatibility/Core/src/Android/AppCompat/FlyoutPageRenderer.cs b/src/Compatibility/Core/src/Android/AppCompat/FlyoutPageRenderer.cs
index 21e744146220..99b3b7f712de 100644
--- a/src/Compatibility/Core/src/Android/AppCompat/FlyoutPageRenderer.cs
+++ b/src/Compatibility/Core/src/Android/AppCompat/FlyoutPageRenderer.cs
@@ -10,8 +10,10 @@
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.Android
 {
+	using global::Android.Graphics.Drawables;
 	using Microsoft.Maui.Controls.Compatibility.Platform.Android.AppCompat;
 	using Microsoft.Maui.Controls.Compatibility.Platform.Android.FastRenderers;
+	using Microsoft.Maui.Controls.Platform;
 	using Microsoft.Maui.Graphics;
 
 	public class FlyoutPageRenderer : DrawerLayout, IVisualElementRenderer, DrawerLayout.IDrawerListener, IManageFragments, ILifeCycleState
@@ -421,11 +423,12 @@ void UpdateBackgroundColor(Page view)
 
 		void UpdateBackgroundImage(Page view)
 		{
-			_ = this.ApplyDrawableAsync(view, Page.BackgroundImageSourceProperty, Context, drawable =>
+			this.ApplyDrawableAsync(view, Page.BackgroundImageSourceProperty, Context,
+				(Drawable drawable) =>
 			{
 				if (drawable != null)
 					this.SetBackground(drawable);
-			});
+			}).FireAndForget(e => Internals.Log.Warning(nameof(FlyoutPageRenderer), $"{e}"));
 		}
 
 		void UpdateDetail()
diff --git a/src/Compatibility/Core/src/Android/AppCompat/FormsAppCompatActivity.cs b/src/Compatibility/Core/src/Android/AppCompat/FormsAppCompatActivity.cs
index b8368dcdc4c7..e467db2e41e1 100644
--- a/src/Compatibility/Core/src/Android/AppCompat/FormsAppCompatActivity.cs
+++ b/src/Compatibility/Core/src/Android/AppCompat/FormsAppCompatActivity.cs
@@ -241,7 +241,7 @@ void OnCreate(
 			SetContentView(_layout);
 
 			Profile.FramePartition("OnStateChanged");
-			Microsoft.Maui.Controls.Application.ClearCurrent();
+			Microsoft.Maui.Controls.Application.Current = null;
 
 			_previousState = _currentState;
 			_currentState = AndroidApplicationLifecycleState.OnCreate;
diff --git a/src/Compatibility/Core/src/Android/AppCompat/FragmentContainer.cs b/src/Compatibility/Core/src/Android/AppCompat/FragmentContainer.cs
index 16ab1c77460e..6c82912417d0 100644
--- a/src/Compatibility/Core/src/Android/AppCompat/FragmentContainer.cs
+++ b/src/Compatibility/Core/src/Android/AppCompat/FragmentContainer.cs
@@ -4,6 +4,7 @@
 using Android.Runtime;
 using Android.Views;
 using AndroidX.Fragment.App;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Controls.PlatformConfiguration.AndroidSpecific.AppCompat;
 using AView = Android.Views.View;
 
diff --git a/src/Compatibility/Core/src/Android/AppCompat/ImageButtonRenderer.cs b/src/Compatibility/Core/src/Android/AppCompat/ImageButtonRenderer.cs
index a3dd5f008ce0..e203b764d000 100644
--- a/src/Compatibility/Core/src/Android/AppCompat/ImageButtonRenderer.cs
+++ b/src/Compatibility/Core/src/Android/AppCompat/ImageButtonRenderer.cs
@@ -7,6 +7,7 @@
 using AndroidX.AppCompat.Widget;
 using Microsoft.Maui.Controls.Compatibility.Platform.Android.FastRenderers;
 using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Controls.PlatformConfiguration.AndroidSpecific;
 using Microsoft.Maui.Graphics;
 using AColor = Android.Graphics.Color;
@@ -322,7 +323,7 @@ bool IOnTouchListener.OnTouch(AView v, MotionEvent e) =>
 		float IBorderVisualElementRenderer.ShadowRadius => Context.ToPixels(OnThisPlatform().GetShadowRadius());
 		float IBorderVisualElementRenderer.ShadowDx => Context.ToPixels(OnThisPlatform().GetShadowOffset().Width);
 		float IBorderVisualElementRenderer.ShadowDy => Context.ToPixels(OnThisPlatform().GetShadowOffset().Height);
-		AColor IBorderVisualElementRenderer.ShadowColor => OnThisPlatform().GetShadowColor().ToAndroid();
+		AColor IBorderVisualElementRenderer.ShadowColor => OnThisPlatform().GetShadowColor().ToAndroid(Colors.Black);
 		bool IBorderVisualElementRenderer.IsShadowEnabled() => OnThisPlatform().GetIsShadowEnabled();
 		bool IBorderVisualElementRenderer.UseDefaultPadding() => false;
 		bool IBorderVisualElementRenderer.UseDefaultShadow() => false;
diff --git a/src/Compatibility/Core/src/Android/AppCompat/NavigationPageRenderer.cs b/src/Compatibility/Core/src/Android/AppCompat/NavigationPageRenderer.cs
index 5ad0152e517b..f8f7f7bc8d02 100644
--- a/src/Compatibility/Core/src/Android/AppCompat/NavigationPageRenderer.cs
+++ b/src/Compatibility/Core/src/Android/AppCompat/NavigationPageRenderer.cs
@@ -17,6 +17,7 @@
 using AndroidX.AppCompat.Graphics.Drawable;
 using AndroidX.DrawerLayout.Widget;
 using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
 using static Android.Views.View;
 using static Microsoft.Maui.Controls.PlatformConfiguration.AndroidSpecific.AppCompat.NavigationPage;
diff --git a/src/Compatibility/Core/src/Android/AppCompat/Platform.cs b/src/Compatibility/Core/src/Android/AppCompat/Platform.cs
index b64bd08bc0f2..471d57c195eb 100644
--- a/src/Compatibility/Core/src/Android/AppCompat/Platform.cs
+++ b/src/Compatibility/Core/src/Android/AppCompat/Platform.cs
@@ -8,6 +8,7 @@
 using Android.Views;
 using Android.Views.Animations;
 using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
 using AView = Android.Views.View;
 
@@ -257,7 +258,7 @@ public static SizeRequest GetNativeSize(VisualElement view, double widthConstrai
 			{
 				returnValue = new SizeRequest(Size.Zero, Size.Zero);
 			}
-			else if (visualElementRenderer == null && view is IView iView)
+			else if ((visualElementRenderer == null || visualElementRenderer is HandlerToRendererShim) && view is IView iView)
 			{
 				returnValue = iView.Handler.GetDesiredSize(widthConstraint, heightConstraint);
 			}
diff --git a/src/Compatibility/Core/src/Android/AppCompat/RadioButtonRenderer.cs b/src/Compatibility/Core/src/Android/AppCompat/RadioButtonRenderer.cs
index 6d4f3ce4a691..a480ee3afaa9 100644
--- a/src/Compatibility/Core/src/Android/AppCompat/RadioButtonRenderer.cs
+++ b/src/Compatibility/Core/src/Android/AppCompat/RadioButtonRenderer.cs
@@ -9,6 +9,7 @@
 using AndroidX.Core.View;
 using Microsoft.Maui.Controls.Compatibility.Platform.Android.FastRenderers;
 using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
 using AColor = Android.Graphics.Color;
 using AView = Android.Views.View;
@@ -273,7 +274,7 @@ void UpdateFont()
 			else
 			{
 				Typeface = font.ToTypeface();
-				SetTextSize(ComplexUnitType.Sp, font.ToScaledPixel());
+				SetTextSize(ComplexUnitType.Sp, (float)font.FontSize);
 			}
 		}
 
diff --git a/src/Compatibility/Core/src/Android/AppCompat/TabbedPageRenderer.cs b/src/Compatibility/Core/src/Android/AppCompat/TabbedPageRenderer.cs
index 44adf8a46b98..15c31a1cbb0c 100644
--- a/src/Compatibility/Core/src/Android/AppCompat/TabbedPageRenderer.cs
+++ b/src/Compatibility/Core/src/Android/AppCompat/TabbedPageRenderer.cs
@@ -14,6 +14,7 @@
 using Google.Android.Material.BottomSheet;
 using Google.Android.Material.Tabs;
 using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Controls.PlatformConfiguration.AndroidSpecific;
 using Microsoft.Maui.Graphics;
 using AColor = Android.Graphics.Color;
diff --git a/src/Compatibility/Core/src/Android/BackgroundManager.cs b/src/Compatibility/Core/src/Android/BackgroundManager.cs
index 0ffb23e6cc51..f61e81817d30 100644
--- a/src/Compatibility/Core/src/Android/BackgroundManager.cs
+++ b/src/Compatibility/Core/src/Android/BackgroundManager.cs
@@ -1,6 +1,7 @@
 using System;
 using System.ComponentModel;
 using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
 using AView = Android.Views.View;
 
diff --git a/src/Compatibility/Core/src/Android/BorderBackgroundManager.cs b/src/Compatibility/Core/src/Android/BorderBackgroundManager.cs
index e70fbf32da62..fbe124d0e6f7 100644
--- a/src/Compatibility/Core/src/Android/BorderBackgroundManager.cs
+++ b/src/Compatibility/Core/src/Android/BorderBackgroundManager.cs
@@ -2,6 +2,7 @@
 using System.ComponentModel;
 using Android.Content.Res;
 using Android.Graphics.Drawables;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
 using AColor = Android.Graphics.Color;
 using AView = Android.Views.View;
diff --git a/src/Compatibility/Core/src/Android/Cells/EntryCellEditText.cs b/src/Compatibility/Core/src/Android/Cells/EntryCellEditText.cs
index 135c9c5d3aef..3e91e9630b22 100644
--- a/src/Compatibility/Core/src/Android/Cells/EntryCellEditText.cs
+++ b/src/Compatibility/Core/src/Android/Cells/EntryCellEditText.cs
@@ -27,7 +27,7 @@ public override bool OnKeyPreIme(Keycode keyCode, KeyEvent e)
 
 		protected override void OnFocusChanged(bool gainFocus, FocusSearchDirection direction, ARect previouslyFocusedRect)
 		{
-			Window window = Context.GetActivity().Window;
+			var window = Context.GetActivity().Window;
 			if (gainFocus)
 			{
 				_startingMode = window.Attributes.SoftInputMode;
diff --git a/src/Compatibility/Core/src/Android/CollectionView/IndicatorViewRenderer.cs b/src/Compatibility/Core/src/Android/CollectionView/IndicatorViewRenderer.cs
index 959fced7782d..150918c08114 100644
--- a/src/Compatibility/Core/src/Android/CollectionView/IndicatorViewRenderer.cs
+++ b/src/Compatibility/Core/src/Android/CollectionView/IndicatorViewRenderer.cs
@@ -5,6 +5,7 @@
 using Android.Views;
 using Android.Widget;
 using Microsoft.Maui.Controls.Compatibility.Platform.Android.FastRenderers;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
 using AColor = Android.Graphics.Color;
 using AShapes = Android.Graphics.Drawables.Shapes;
diff --git a/src/Compatibility/Core/src/Android/CollectionView/ItemsViewRenderer.cs b/src/Compatibility/Core/src/Android/CollectionView/ItemsViewRenderer.cs
index d3a8b8ea2200..47351691b02d 100644
--- a/src/Compatibility/Core/src/Android/CollectionView/ItemsViewRenderer.cs
+++ b/src/Compatibility/Core/src/Android/CollectionView/ItemsViewRenderer.cs
@@ -6,6 +6,7 @@
 using Microsoft.Maui.Controls.Compatibility.Platform.Android.CollectionView;
 using Microsoft.Maui.Controls.Compatibility.Platform.Android.FastRenderers;
 using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
 using ARect = Android.Graphics.Rect;
 using AViewCompat = AndroidX.Core.View.ViewCompat;
diff --git a/src/Compatibility/Core/src/Android/Compatibility.Android.csproj b/src/Compatibility/Core/src/Android/Compatibility.Android.csproj
index ef0eaae62bfc..fe0a2b01cc3b 100644
--- a/src/Compatibility/Core/src/Android/Compatibility.Android.csproj
+++ b/src/Compatibility/Core/src/Android/Compatibility.Android.csproj
@@ -32,8 +32,6 @@
     <AndroidResource Include="Resources\layout\toolbar.axml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\Controls\src\Core\Crc64.cs" Link="Crc64.cs" />
-    <Compile Include="..\..\..\..\Controls\src\Core\StreamWrapper.cs" Link="StreamWrapper.cs" />
     <Compile Include="..\AppHostBuilderExtensions.cs" Link="AppHostBuilderExtensions.cs" />
     <Compile Include="..\MauiHandlersCollectionExtensions.cs" Link="MauiHandlersCollectionExtensions.cs" />
   </ItemGroup>
diff --git a/src/Compatibility/Core/src/Android/Elevation.cs b/src/Compatibility/Core/src/Android/Elevation.cs
index 89eb9472bb0b..7403abc5500b 100644
--- a/src/Compatibility/Core/src/Android/Elevation.cs
+++ b/src/Compatibility/Core/src/Android/Elevation.cs
@@ -13,6 +13,16 @@ public static void SetElevation(global::Android.Views.View view, VisualElement e
 			}
 
 			var elevation = GetElevation(element, view.Context);
+			SetElevation(view, elevation);
+		}
+
+		public static void SetElevation(global::Android.Views.View view, float? elevation)
+		{
+			if (view == null || !Forms.IsLollipopOrNewer)
+			{
+				return;
+			}
+
 			if (!elevation.HasValue)
 			{
 				return;
diff --git a/src/Compatibility/Core/src/Android/Extensions/JavaObjectExtensions.cs b/src/Compatibility/Core/src/Android/Extensions/JavaObjectExtensions.cs
deleted file mode 100644
index 402ff18c39d3..000000000000
--- a/src/Compatibility/Core/src/Android/Extensions/JavaObjectExtensions.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-
-namespace Microsoft.Maui.Controls.Compatibility.Platform.Android
-{
-	internal static class JavaObjectExtensions
-	{
-		public static bool IsDisposed(this Java.Lang.Object obj)
-		{
-			return obj.Handle == IntPtr.Zero;
-		}
-
-		public static bool IsAlive(this Java.Lang.Object obj)
-		{
-			if (obj == null)
-				return false;
-
-			return !obj.IsDisposed();
-		}
-
-		public static bool IsDisposed(this global::Android.Runtime.IJavaObject obj)
-		{
-			return obj.Handle == IntPtr.Zero;
-		}
-
-		public static bool IsAlive(this global::Android.Runtime.IJavaObject obj)
-		{
-			if (obj == null)
-				return false;
-
-			return !obj.IsDisposed();
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Compatibility/Core/src/Android/FastRenderers/ButtonRenderer.cs b/src/Compatibility/Core/src/Android/FastRenderers/ButtonRenderer.cs
index 0b2aa41a3b49..04994b23196f 100644
--- a/src/Compatibility/Core/src/Android/FastRenderers/ButtonRenderer.cs
+++ b/src/Compatibility/Core/src/Android/FastRenderers/ButtonRenderer.cs
@@ -7,6 +7,7 @@
 using AndroidX.AppCompat.Widget;
 using AndroidX.Core.View;
 using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Controls.PlatformConfiguration.AndroidSpecific;
 using AColor = Android.Graphics.Color;
 using AView = Android.Views.View;
@@ -337,7 +338,7 @@ void UpdateFont()
 			else
 			{
 				Typeface = font.ToTypeface();
-				SetTextSize(ComplexUnitType.Sp, font.ToScaledPixel());
+				SetTextSize(ComplexUnitType.Sp, (float)font.FontSize);
 			}
 		}
 
diff --git a/src/Compatibility/Core/src/Android/FastRenderers/FrameRenderer.cs b/src/Compatibility/Core/src/Android/FastRenderers/FrameRenderer.cs
index e18dd001d5fa..82bf172939bf 100644
--- a/src/Compatibility/Core/src/Android/FastRenderers/FrameRenderer.cs
+++ b/src/Compatibility/Core/src/Android/FastRenderers/FrameRenderer.cs
@@ -6,6 +6,7 @@
 using Android.Views;
 using AndroidX.CardView.Widget;
 using AndroidX.Core.View;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
 using AColor = Android.Graphics.Color;
 using AView = Android.Views.View;
diff --git a/src/Compatibility/Core/src/Android/FastRenderers/ImageRenderer.cs b/src/Compatibility/Core/src/Android/FastRenderers/ImageRenderer.cs
index 0ad7fee81e48..88fcd1c557ea 100644
--- a/src/Compatibility/Core/src/Android/FastRenderers/ImageRenderer.cs
+++ b/src/Compatibility/Core/src/Android/FastRenderers/ImageRenderer.cs
@@ -5,6 +5,7 @@
 using Android.Views;
 using AndroidX.Core.View;
 using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
 using AImageView = Android.Widget.ImageView;
 using AView = Android.Views.View;
diff --git a/src/Compatibility/Core/src/Android/FastRenderers/LabelRenderer.cs b/src/Compatibility/Core/src/Android/FastRenderers/LabelRenderer.cs
index d345458f44ae..7cd72f540224 100644
--- a/src/Compatibility/Core/src/Android/FastRenderers/LabelRenderer.cs
+++ b/src/Compatibility/Core/src/Android/FastRenderers/LabelRenderer.cs
@@ -7,6 +7,7 @@
 using Android.Util;
 using Android.Views;
 using AndroidX.Core.View;
+using Microsoft.Maui.Controls.Platform;
 using AView = Android.Views.View;
 using Color = Microsoft.Maui.Graphics.Color;
 using Size = Microsoft.Maui.Graphics.Size;
@@ -323,7 +324,7 @@ void UpdateFont()
 				_lastTypeface = newTypeface;
 			}
 
-			float newTextSize = f.ToScaledPixel();
+			float newTextSize = (float)f.FontSize;
 			if (newTextSize != _lastTextSize)
 			{
 				SetTextSize(ComplexUnitType.Sp, newTextSize);
diff --git a/src/Compatibility/Core/src/Android/Forms.cs b/src/Compatibility/Core/src/Android/Forms.cs
index 9854bd14d257..8351b2145067 100644
--- a/src/Compatibility/Core/src/Android/Forms.cs
+++ b/src/Compatibility/Core/src/Android/Forms.cs
@@ -62,7 +62,6 @@ public static class Forms
 		static bool? s_isNougatOrNewer;
 		static bool? s_isOreoOrNewer;
 		static bool? s_isPieOrNewer;
-		static FontManager s_fontManager;
 
 		// One per process; does not change, suitable for loading resources (e.g., ResourceProvider)
 		internal static Context ApplicationContext { get; private set; } = global::Android.App.Application.Context;
@@ -155,9 +154,6 @@ internal static bool IsPieOrNewer
 			}
 		}
 
-		internal static IFontManager FontManager =>
-			s_fontManager ??= new FontManager(Registrar.FontRegistrar);
-
 		public static float GetFontSizeNormal(Context context)
 		{
 			float size = 50;
@@ -875,7 +871,8 @@ public async Task<Stream> GetStreamAsync(Uri uri, CancellationToken cancellation
 
 			public IIsolatedStorageFile GetUserStoreForApplication()
 			{
-				return new _IsolatedStorageFile(IsolatedStorageFile.GetUserStoreForApplication());
+				throw new NotImplementedException("GetUserStoreForApplication currently not available https://github.com/dotnet/runtime/issues/52332");
+				//return new _IsolatedStorageFile(IsolatedStorageFile.GetUserStoreForApplication());
 			}
 
 			public bool IsInvokeRequired
diff --git a/src/Compatibility/Core/src/Android/PopupManager.cs b/src/Compatibility/Core/src/Android/PopupManager.cs
index 7798f3d275cf..7b376797e3ee 100644
--- a/src/Compatibility/Core/src/Android/PopupManager.cs
+++ b/src/Compatibility/Core/src/Android/PopupManager.cs
@@ -9,6 +9,7 @@
 using Microsoft.Maui.Controls.Internals;
 using AppCompatActivity = AndroidX.AppCompat.App.AppCompatActivity;
 using AppCompatAlertDialog = AndroidX.AppCompat.App.AlertDialog;
+using AWindow = Android.Views.Window;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.Android
 {
@@ -487,7 +488,7 @@ public void SetView(global::Android.Views.View view)
 					}
 				}
 
-				public Window Window => _useAppCompat ? _appcompatAlertDialog.Window : _legacyAlertDialog.Window;
+				public AWindow Window => _useAppCompat ? _appcompatAlertDialog.Window : _legacyAlertDialog.Window;
 
 				public void Show()
 				{
diff --git a/src/Compatibility/Core/src/Android/RendererPool.cs b/src/Compatibility/Core/src/Android/RendererPool.cs
index aa6077f633e1..e4b00aa35f24 100644
--- a/src/Compatibility/Core/src/Android/RendererPool.cs
+++ b/src/Compatibility/Core/src/Android/RendererPool.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Android.Views;
+using Microsoft.Maui.Controls.Platform;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.Android
 {
diff --git a/src/Compatibility/Core/src/Android/RendererToHandlerShim.cs b/src/Compatibility/Core/src/Android/RendererToHandlerShim.cs
index a8758cd72abc..43dc07da4275 100644
--- a/src/Compatibility/Core/src/Android/RendererToHandlerShim.cs
+++ b/src/Compatibility/Core/src/Android/RendererToHandlerShim.cs
@@ -22,7 +22,7 @@ public static IViewHandler CreateShim(object renderer)
 			return new RendererToHandlerShim();
 		}
 
-		public RendererToHandlerShim() : base(Handlers.ViewHandler.ViewMapper)
+		public RendererToHandlerShim() : base(ViewHandler.ViewMapper)
 		{
 		}
 
@@ -113,15 +113,15 @@ public override Size GetDesiredSize(double widthConstraint, double heightConstra
 				VisualElementRenderer, widthConstraint, heightConstraint);
 		}
 
-		public override void SetFrame(Rectangle frame)
+		public override void NativeArrange(Rectangle frame)
 		{
 			// This is a hack to force the shimmed control to actually do layout; without this, some controls won't actually
 			// call OnLayout after SetFrame if their sizes haven't changed (e.g., ScrollView)
 			// Luckily, measuring with MeasureSpecMode.Exactly is pretty fast, since it just returns the value you give it.
-			NativeView.Measure(MeasureSpecMode.Exactly.MakeMeasureSpec((int)frame.Width), 
+			NativeView?.Measure(MeasureSpecMode.Exactly.MakeMeasureSpec((int)frame.Width),
 				MeasureSpecMode.Exactly.MakeMeasureSpec((int)frame.Height));
 
-			base.SetFrame(frame);
+			base.NativeArrange(frame);
 		}
 	}
 }
diff --git a/src/Compatibility/Core/src/Android/Renderers/AndroidGIFImageParser.cs b/src/Compatibility/Core/src/Android/Renderers/AndroidGIFImageParser.cs
index 1242e6e79d05..75ac1463e6d7 100644
--- a/src/Compatibility/Core/src/Android/Renderers/AndroidGIFImageParser.cs
+++ b/src/Compatibility/Core/src/Android/Renderers/AndroidGIFImageParser.cs
@@ -218,18 +218,18 @@ public override bool SelectDrawable(int index)
 
 		public static async Task<IFormsAnimationDrawable> LoadImageAnimationAsync(UriImageSource imagesource, Context context, CancellationToken cancelationToken = default(CancellationToken))
 		{
-			Uri uri = imagesource?.Uri;
 			FormsAnimationDrawable animation = null;
 
-			if (uri != null)
+			if (imagesource is IStreamImageSource streamImageSource)
 			{
-				var options = new BitmapFactory.Options
+				using var stream = await streamImageSource.GetStreamAsync(cancelationToken).ConfigureAwait(false);
+				if (stream != null)
 				{
-					InJustDecodeBounds = true
-				};
+					var options = new BitmapFactory.Options
+					{
+						InJustDecodeBounds = true
+					};
 
-				using (Stream stream = await imagesource.GetStreamAsync(cancelationToken).ConfigureAwait(false))
-				{
 					using (var decoder = new AndroidGIFImageParser(context, options.InDensity, options.InTargetDensity))
 					{
 						try
@@ -247,11 +247,11 @@ public override bool SelectDrawable(int index)
 							animation = null;
 						}
 					}
-				}
 
-				if (animation == null)
-				{
-					Log.Warning(nameof(FileImageSourceHandler), "Could not retrieve image or image data was invalid: {0}", imagesource);
+					if (animation == null)
+					{
+						Log.Warning(nameof(FileImageSourceHandler), "Could not retrieve image or image data was invalid: {0}", imagesource);
+					}
 				}
 			}
 
diff --git a/src/Compatibility/Core/src/Android/Renderers/BorderDrawable.cs b/src/Compatibility/Core/src/Android/Renderers/BorderDrawable.cs
index acc73af8ca52..b297c2893a2a 100644
--- a/src/Compatibility/Core/src/Android/Renderers/BorderDrawable.cs
+++ b/src/Compatibility/Core/src/Android/Renderers/BorderDrawable.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using Android.Graphics;
 using Android.Graphics.Drawables;
+using Microsoft.Maui.Controls.Platform;
 using AColor = Android.Graphics.Color;
 using APath = Android.Graphics.Path;
 using Color = Microsoft.Maui.Graphics.Color;
@@ -289,7 +290,7 @@ public void DrawOutline(Canvas canvas, int width, int height)
 				path.AddRoundRect(rect, borderRadius, borderRadius, APath.Direction.Cw);
 				paint.StrokeWidth = borderWidth;
 				paint.SetStyle(Paint.Style.Stroke);
-				paint.Color = BorderElement.BorderColor.ToAndroid();
+				paint.Color = BorderElement.BorderColor.ToAndroid(Graphics.Colors.Black);
 
 				canvas.DrawPath(path, paint);
 			}
diff --git a/src/Compatibility/Core/src/Android/Renderers/BottomNavigationViewUtils.cs b/src/Compatibility/Core/src/Android/Renderers/BottomNavigationViewUtils.cs
index 1952208f0637..da5a6f8225fc 100644
--- a/src/Compatibility/Core/src/Android/Renderers/BottomNavigationViewUtils.cs
+++ b/src/Compatibility/Core/src/Android/Renderers/BottomNavigationViewUtils.cs
@@ -7,6 +7,7 @@
 using Android.Widget;
 using Google.Android.Material.BottomNavigation;
 using Google.Android.Material.BottomSheet;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
 using AColor = Android.Graphics.Color;
 using ALabelVisibilityMode = Google.Android.Material.BottomNavigation.LabelVisibilityMode;
diff --git a/src/Compatibility/Core/src/Android/Renderers/BoxRenderer.cs b/src/Compatibility/Core/src/Android/Renderers/BoxRenderer.cs
index 23f545246872..d162d935ce63 100644
--- a/src/Compatibility/Core/src/Android/Renderers/BoxRenderer.cs
+++ b/src/Compatibility/Core/src/Android/Renderers/BoxRenderer.cs
@@ -2,6 +2,7 @@
 using Android.Content;
 using Android.Graphics.Drawables;
 using Android.Views;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.Android
diff --git a/src/Compatibility/Core/src/Android/Renderers/CarouselPageAdapter.cs b/src/Compatibility/Core/src/Android/Renderers/CarouselPageAdapter.cs
index a7e5869deb65..51d17ec3a46d 100644
--- a/src/Compatibility/Core/src/Android/Renderers/CarouselPageAdapter.cs
+++ b/src/Compatibility/Core/src/Android/Renderers/CarouselPageAdapter.cs
@@ -6,6 +6,7 @@
 using AndroidX.Core.View;
 using AndroidX.ViewPager.Widget;
 using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Controls.Platform;
 using Object = Java.Lang.Object;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.Android
diff --git a/src/Compatibility/Core/src/Android/Renderers/CircularProgress.cs b/src/Compatibility/Core/src/Android/Renderers/CircularProgress.cs
index 22fc9b6d549d..8bba52672658 100644
--- a/src/Compatibility/Core/src/Android/Renderers/CircularProgress.cs
+++ b/src/Compatibility/Core/src/Android/Renderers/CircularProgress.cs
@@ -6,6 +6,7 @@
 using Android.OS;
 using Android.Util;
 using Android.Views;
+using Microsoft.Maui.Controls.Platform;
 using AColor = Android.Graphics.Color;
 using AProgressBar = Android.Widget.ProgressBar;
 using Color = Microsoft.Maui.Graphics.Color;
diff --git a/src/Compatibility/Core/src/Android/Renderers/EntryRenderer.cs b/src/Compatibility/Core/src/Android/Renderers/EntryRenderer.cs
index 9aca16339331..a37ab4036dbb 100644
--- a/src/Compatibility/Core/src/Android/Renderers/EntryRenderer.cs
+++ b/src/Compatibility/Core/src/Android/Renderers/EntryRenderer.cs
@@ -76,6 +76,7 @@ public EntryRendererBase(Context context) : base(context)
 			AutoPackage = false;
 		}
 
+		[PortHandler("Still pending the code related to Keyboard.")]
 		bool TextView.IOnEditorActionListener.OnEditorAction(TextView v, ImeAction actionId, KeyEvent e)
 		{
 			// Fire Completed and dismiss keyboard for hardware / physical keyboards
diff --git a/src/Compatibility/Core/src/Android/Renderers/FontExtensions.cs b/src/Compatibility/Core/src/Android/Renderers/FontExtensions.cs
index 968011bd8fbe..bf1bffd7f92e 100644
--- a/src/Compatibility/Core/src/Android/Renderers/FontExtensions.cs
+++ b/src/Compatibility/Core/src/Android/Renderers/FontExtensions.cs
@@ -5,14 +5,11 @@ namespace Microsoft.Maui.Controls.Compatibility.Platform.Android
 {
 	public static class FontExtensions
 	{
-		public static float ToScaledPixel(this Font self)
-			=> Forms.FontManager.GetScaledPixel(self);
-
 		public static Typeface ToTypeface(this Font self)
-			=> Forms.FontManager.GetTypeface(self);
+			=> CompatServiceProvider.FontManager.GetTypeface(self);
 
 		internal static Typeface ToTypeface(this string fontfamily, FontAttributes attr = FontAttributes.None)
-			=> Forms.FontManager.GetTypeface(Font.OfSize(fontfamily, 0.0).WithAttributes(attr));
+			=> CompatServiceProvider.FontManager.GetTypeface(Font.OfSize(fontfamily, 0.0).WithAttributes(attr));
 
 		internal static bool IsDefault(this IFontElement self)
 			=> self.FontFamily == null && self.FontSize == Device.GetNamedSize(NamedSize.Default, typeof(Label), true) && self.FontAttributes == FontAttributes.None;
@@ -20,11 +17,11 @@ internal static bool IsDefault(this IFontElement self)
 		internal static Typeface ToTypeface(this IFontElement self)
 		{
 			if (self.IsDefault())
-				return Forms.FontManager.DefaultTypeface;
+				return CompatServiceProvider.FontManager.DefaultTypeface;
 
 			var font = Font.OfSize(self.FontFamily, self.FontSize).WithAttributes(self.FontAttributes);
 
-			return Forms.FontManager.GetTypeface(font);
+			return CompatServiceProvider.FontManager.GetTypeface(font);
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Compatibility/Core/src/Android/Renderers/FormattedStringExtensions.cs b/src/Compatibility/Core/src/Android/Renderers/FormattedStringExtensions.cs
index 0130cac849f0..540bb7d0b021 100644
--- a/src/Compatibility/Core/src/Android/Renderers/FormattedStringExtensions.cs
+++ b/src/Compatibility/Core/src/Android/Renderers/FormattedStringExtensions.cs
@@ -102,7 +102,7 @@ public override void UpdateMeasureState(TextPaint p)
 			void Apply(Paint paint)
 			{
 				paint.SetTypeface(Font.ToTypeface());
-				float value = Font.ToScaledPixel();
+				float value = (float)Font.FontSize;
 				paint.TextSize = TypedValue.ApplyDimension(ComplexUnitType.Sp, value, TextView.Resources.DisplayMetrics);
 				if (Forms.IsLollipopOrNewer)
 				{
diff --git a/src/Compatibility/Core/src/Android/Renderers/ImageExtensions.cs b/src/Compatibility/Core/src/Android/Renderers/ImageExtensions.cs
deleted file mode 100644
index afb5c968319a..000000000000
--- a/src/Compatibility/Core/src/Android/Renderers/ImageExtensions.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Android.Widget;
-
-namespace Microsoft.Maui.Controls.Compatibility.Platform.Android
-{
-	internal static class ImageExtensions
-	{
-		static ImageView.ScaleType s_fill;
-		static ImageView.ScaleType s_aspectFill;
-		static ImageView.ScaleType s_aspectFit;
-
-		public static ImageView.ScaleType ToScaleType(this Aspect aspect)
-		{
-			switch (aspect)
-			{
-				case Aspect.Fill:
-					return s_fill ?? (s_fill = ImageView.ScaleType.FitXy);
-				case Aspect.AspectFill:
-					return s_aspectFill ?? (s_aspectFill = ImageView.ScaleType.CenterCrop);
-				default:
-				case Aspect.AspectFit:
-					return s_aspectFit ?? (s_aspectFit = ImageView.ScaleType.FitCenter);
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Compatibility/Core/src/Android/Renderers/ImageLoaderSourceHandler.cs b/src/Compatibility/Core/src/Android/Renderers/ImageLoaderSourceHandler.cs
index 709c5753126e..48871e6acec9 100644
--- a/src/Compatibility/Core/src/Android/Renderers/ImageLoaderSourceHandler.cs
+++ b/src/Compatibility/Core/src/Android/Renderers/ImageLoaderSourceHandler.cs
@@ -11,17 +11,20 @@ public sealed class ImageLoaderSourceHandler : IAnimationSourceHandler, IImageSo
 	{
 		public async Task<Bitmap> LoadImageAsync(ImageSource imagesource, Context context, CancellationToken cancelationToken = default(CancellationToken))
 		{
-			var imageLoader = imagesource as UriImageSource;
 			Bitmap bitmap = null;
-			if (imageLoader?.Uri != null)
+
+			if (imagesource is IStreamImageSource imageLoader)
 			{
-				using (Stream imageStream = await imageLoader.GetStreamAsync(cancelationToken).ConfigureAwait(false))
+				using var imageStream = await imageLoader.GetStreamAsync(cancelationToken).ConfigureAwait(false);
+				if (imageStream != null)
+				{
 					bitmap = await BitmapFactory.DecodeStreamAsync(imageStream).ConfigureAwait(false);
-			}
 
-			if (bitmap == null)
-			{
-				Log.Warning(nameof(ImageLoaderSourceHandler), "Could not retrieve image or image data was invalid: {0}", imageLoader);
+					if (bitmap == null)
+					{
+						Log.Warning(nameof(ImageLoaderSourceHandler), "Could not retrieve image or image data was invalid: {0}", imagesource);
+					}
+				}
 			}
 
 			return bitmap;
diff --git a/src/Compatibility/Core/src/Android/Renderers/LabelRenderer.cs b/src/Compatibility/Core/src/Android/Renderers/LabelRenderer.cs
index ec612adacde0..301d118ca85a 100644
--- a/src/Compatibility/Core/src/Android/Renderers/LabelRenderer.cs
+++ b/src/Compatibility/Core/src/Android/Renderers/LabelRenderer.cs
@@ -201,7 +201,7 @@ void UpdateFont()
 				_lastTypeface = newTypeface;
 			}
 
-			float newTextSize = f.ToScaledPixel();
+			float newTextSize = (float)f.FontSize;
 			if (newTextSize != _lastTextSize)
 			{
 				_view.SetTextSize(ComplexUnitType.Sp, newTextSize);
diff --git a/src/Compatibility/Core/src/Android/Renderers/MasterDetailContainer.cs b/src/Compatibility/Core/src/Android/Renderers/MasterDetailContainer.cs
index 3d94f8bd0e5d..577600751866 100644
--- a/src/Compatibility/Core/src/Android/Renderers/MasterDetailContainer.cs
+++ b/src/Compatibility/Core/src/Android/Renderers/MasterDetailContainer.cs
@@ -4,6 +4,7 @@
 using Android.Runtime;
 using Android.Views;
 using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.Android
diff --git a/src/Compatibility/Core/src/Android/Renderers/PageRenderer.cs b/src/Compatibility/Core/src/Android/Renderers/PageRenderer.cs
index b15fada7c1d2..38f5a0c8492f 100644
--- a/src/Compatibility/Core/src/Android/Renderers/PageRenderer.cs
+++ b/src/Compatibility/Core/src/Android/Renderers/PageRenderer.cs
@@ -4,6 +4,7 @@
 using Android.Views;
 using Android.Views.Accessibility;
 using AndroidX.Core.Content;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
 using AColor = Android.Graphics.Color;
 using AColorRes = Android.Resource.Color;
diff --git a/src/Compatibility/Core/src/Android/Renderers/RefreshViewRenderer.cs b/src/Compatibility/Core/src/Android/Renderers/RefreshViewRenderer.cs
index 765f7d52c761..50466db06645 100644
--- a/src/Compatibility/Core/src/Android/Renderers/RefreshViewRenderer.cs
+++ b/src/Compatibility/Core/src/Android/Renderers/RefreshViewRenderer.cs
@@ -9,6 +9,7 @@
 using AndroidX.RecyclerView.Widget;
 using AndroidX.SwipeRefreshLayout.Widget;
 using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
 using AView = Android.Views.View;
 using AWebView = Android.Webkit.WebView;
diff --git a/src/Compatibility/Core/src/Android/Renderers/ScrollViewContainer.cs b/src/Compatibility/Core/src/Android/Renderers/ScrollViewContainer.cs
index 7dc2f2540e10..455dfdb74d4c 100644
--- a/src/Compatibility/Core/src/Android/Renderers/ScrollViewContainer.cs
+++ b/src/Compatibility/Core/src/Android/Renderers/ScrollViewContainer.cs
@@ -1,5 +1,6 @@
 using Android.Content;
 using Android.Views;
+using Microsoft.Maui.Controls.Platform;
 using AView = Android.Views.View;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.Android
diff --git a/src/Compatibility/Core/src/Android/Renderers/ScrollViewRenderer.cs b/src/Compatibility/Core/src/Android/Renderers/ScrollViewRenderer.cs
index b6efd2e241a1..a9b3d9952e96 100644
--- a/src/Compatibility/Core/src/Android/Renderers/ScrollViewRenderer.cs
+++ b/src/Compatibility/Core/src/Android/Renderers/ScrollViewRenderer.cs
@@ -8,6 +8,7 @@
 using Android.Widget;
 using AndroidX.Core.Widget;
 using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
 using AView = Android.Views.View;
 using Point = Microsoft.Maui.Graphics.Point;
diff --git a/src/Compatibility/Core/src/Android/Renderers/ShellBottomNavViewAppearanceTracker.cs b/src/Compatibility/Core/src/Android/Renderers/ShellBottomNavViewAppearanceTracker.cs
index 3f99af543113..ee8c80a89355 100644
--- a/src/Compatibility/Core/src/Android/Renderers/ShellBottomNavViewAppearanceTracker.cs
+++ b/src/Compatibility/Core/src/Android/Renderers/ShellBottomNavViewAppearanceTracker.cs
@@ -2,6 +2,7 @@
 using Android.Content.Res;
 using Android.Graphics.Drawables;
 using Google.Android.Material.BottomNavigation;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
 using AColor = Android.Graphics.Color;
 using R = Android.Resource;
diff --git a/src/Compatibility/Core/src/Android/Renderers/ShellFlyoutRenderer.cs b/src/Compatibility/Core/src/Android/Renderers/ShellFlyoutRenderer.cs
index 5da0d68f8a18..a7eede9eadfc 100644
--- a/src/Compatibility/Core/src/Android/Renderers/ShellFlyoutRenderer.cs
+++ b/src/Compatibility/Core/src/Android/Renderers/ShellFlyoutRenderer.cs
@@ -6,6 +6,7 @@
 using Android.Views;
 using AndroidX.DrawerLayout.Widget;
 using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
 using AView = Android.Views.View;
 using Color = Microsoft.Maui.Graphics.Color;
diff --git a/src/Compatibility/Core/src/Android/Renderers/ShellFlyoutTemplatedContentRenderer.cs b/src/Compatibility/Core/src/Android/Renderers/ShellFlyoutTemplatedContentRenderer.cs
index 9ac78e26c6ce..631783318e8b 100644
--- a/src/Compatibility/Core/src/Android/Renderers/ShellFlyoutTemplatedContentRenderer.cs
+++ b/src/Compatibility/Core/src/Android/Renderers/ShellFlyoutTemplatedContentRenderer.cs
@@ -10,6 +10,7 @@
 using AndroidX.RecyclerView.Widget;
 using Google.Android.Material.AppBar;
 using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Controls.Platform;
 using AView = Android.Views.View;
 using LP = Android.Views.ViewGroup.LayoutParams;
 
diff --git a/src/Compatibility/Core/src/Android/Renderers/ShellItemRenderer.cs b/src/Compatibility/Core/src/Android/Renderers/ShellItemRenderer.cs
index 9ab6241c7189..65ffb8055a6c 100644
--- a/src/Compatibility/Core/src/Android/Renderers/ShellItemRenderer.cs
+++ b/src/Compatibility/Core/src/Android/Renderers/ShellItemRenderer.cs
@@ -9,6 +9,7 @@
 using Android.Widget;
 using Google.Android.Material.BottomNavigation;
 using Google.Android.Material.BottomSheet;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
 using AColor = Android.Graphics.Color;
 using AView = Android.Views.View;
diff --git a/src/Compatibility/Core/src/Android/Renderers/ShellItemRendererBase.cs b/src/Compatibility/Core/src/Android/Renderers/ShellItemRendererBase.cs
index 95d9af496b4d..cdb511a13388 100644
--- a/src/Compatibility/Core/src/Android/Renderers/ShellItemRendererBase.cs
+++ b/src/Compatibility/Core/src/Android/Renderers/ShellItemRendererBase.cs
@@ -7,6 +7,7 @@
 using Android.Views;
 using AndroidX.Fragment.App;
 using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.Android
diff --git a/src/Compatibility/Core/src/Android/Renderers/ShellRenderer.cs b/src/Compatibility/Core/src/Android/Renderers/ShellRenderer.cs
index 3b669719decb..5c8b153787b6 100644
--- a/src/Compatibility/Core/src/Android/Renderers/ShellRenderer.cs
+++ b/src/Compatibility/Core/src/Android/Renderers/ShellRenderer.cs
@@ -8,6 +8,7 @@
 using AndroidX.DrawerLayout.Widget;
 using AndroidX.Fragment.App;
 using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
 using AColor = Android.Graphics.Color;
 using ARect = Android.Graphics.Rect;
diff --git a/src/Compatibility/Core/src/Android/Renderers/ShellSearchView.cs b/src/Compatibility/Core/src/Android/Renderers/ShellSearchView.cs
index d17843f17fcc..9febabe89e30 100644
--- a/src/Compatibility/Core/src/Android/Renderers/ShellSearchView.cs
+++ b/src/Compatibility/Core/src/Android/Renderers/ShellSearchView.cs
@@ -12,6 +12,7 @@
 using AndroidX.CardView.Widget;
 using Java.Lang;
 using Microsoft.Maui.Controls.Compatibility.Platform.Android.FastRenderers;
+using Microsoft.Maui.Controls.Platform;
 using AColor = Android.Graphics.Color;
 using AImageButton = Android.Widget.ImageButton;
 using ASupportDrawable = AndroidX.AppCompat.Graphics.Drawable;
diff --git a/src/Compatibility/Core/src/Android/Renderers/ShellTabLayoutAppearanceTracker.cs b/src/Compatibility/Core/src/Android/Renderers/ShellTabLayoutAppearanceTracker.cs
index d450a911a1b6..5582a4c00886 100644
--- a/src/Compatibility/Core/src/Android/Renderers/ShellTabLayoutAppearanceTracker.cs
+++ b/src/Compatibility/Core/src/Android/Renderers/ShellTabLayoutAppearanceTracker.cs
@@ -1,5 +1,6 @@
 using Android.Graphics.Drawables;
 using Google.Android.Material.Tabs;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.Android
diff --git a/src/Compatibility/Core/src/Android/Renderers/ShellToolbarAppearanceTracker.cs b/src/Compatibility/Core/src/Android/Renderers/ShellToolbarAppearanceTracker.cs
index 6bbff15fa8a5..46e2bcb201f2 100644
--- a/src/Compatibility/Core/src/Android/Renderers/ShellToolbarAppearanceTracker.cs
+++ b/src/Compatibility/Core/src/Android/Renderers/ShellToolbarAppearanceTracker.cs
@@ -1,5 +1,6 @@
 using Android.Graphics.Drawables;
 using AndroidX.AppCompat.Widget;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.Android
diff --git a/src/Compatibility/Core/src/Android/Renderers/ShellToolbarTracker.cs b/src/Compatibility/Core/src/Android/Renderers/ShellToolbarTracker.cs
index 4f0de383c6de..df9b2a77221b 100644
--- a/src/Compatibility/Core/src/Android/Renderers/ShellToolbarTracker.cs
+++ b/src/Compatibility/Core/src/Android/Renderers/ShellToolbarTracker.cs
@@ -14,6 +14,7 @@
 using AndroidX.DrawerLayout.Widget;
 using Google.Android.Material.AppBar;
 using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
 using AColor = Android.Graphics.Color;
 using ActionBarDrawerToggle = AndroidX.AppCompat.App.ActionBarDrawerToggle;
diff --git a/src/Compatibility/Core/src/Android/Renderers/ShellViewRenderer.cs b/src/Compatibility/Core/src/Android/Renderers/ShellViewRenderer.cs
index c98630d24460..cfacbb16b235 100644
--- a/src/Compatibility/Core/src/Android/Renderers/ShellViewRenderer.cs
+++ b/src/Compatibility/Core/src/Android/Renderers/ShellViewRenderer.cs
@@ -4,6 +4,7 @@
 using Android.Util;
 using Android.Views;
 using Google.Android.Material.AppBar;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
 using AView = Android.Views.View;
 using LP = Android.Views.ViewGroup.LayoutParams;
diff --git a/src/Compatibility/Core/src/Android/Renderers/SwipeViewRenderer.cs b/src/Compatibility/Core/src/Android/Renderers/SwipeViewRenderer.cs
index cc639793cebd..ffe76677dcea 100644
--- a/src/Compatibility/Core/src/Android/Renderers/SwipeViewRenderer.cs
+++ b/src/Compatibility/Core/src/Android/Renderers/SwipeViewRenderer.cs
@@ -11,6 +11,7 @@
 using AndroidX.RecyclerView.Widget;
 using Microsoft.Maui.Controls.Compatibility.Platform.Android.AppCompat;
 using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Controls.PlatformConfiguration.AndroidSpecific;
 using Microsoft.Maui.Graphics;
 using AButton = AndroidX.AppCompat.Widget.AppCompatButton;
diff --git a/src/Compatibility/Core/src/Android/ViewExtensions.cs b/src/Compatibility/Core/src/Android/ViewExtensions.cs
index 24978437c6cb..78a32d24dac2 100644
--- a/src/Compatibility/Core/src/Android/ViewExtensions.cs
+++ b/src/Compatibility/Core/src/Android/ViewExtensions.cs
@@ -12,100 +12,8 @@
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.Android
 {
-	public static class ViewExtensions
+	internal static class ViewExtensions
 	{
-		static readonly int s_apiLevel;
-
-		static ViewExtensions()
-		{
-			s_apiLevel = (int)Forms.SdkInt;
-		}
-
-		public static void RemoveFromParent(this AView view)
-		{
-			if (view == null)
-				return;
-			if (view.Parent == null)
-				return;
-			((ViewGroup)view.Parent).RemoveView(view);
-		}
-
-		public static void SetBackground(this AView view, Drawable drawable)
-		{
-			if (s_apiLevel < 16)
-			{
-#pragma warning disable 618 // Using older method for compatibility with API 15
-				view.SetBackgroundDrawable(drawable);
-#pragma warning restore 618
-			}
-			else
-			{
-				view.Background = drawable;
-			}
-
-		}
-
-		public static void SetWindowBackground(this AView view)
-		{
-			Context context = view.Context;
-			using (var background = new TypedValue())
-			{
-				if (context.Theme.ResolveAttribute(global::Android.Resource.Attribute.WindowBackground, background, true))
-				{
-					string type = context.Resources.GetResourceTypeName(background.ResourceId).ToLower();
-					switch (type)
-					{
-						case "color":
-							var color = new AColor(ContextCompat.GetColor(context, background.ResourceId));
-							view.SetBackgroundColor(color);
-							break;
-						case "drawable":
-							using (Drawable drawable = ContextCompat.GetDrawable(context, background.ResourceId))
-								view.SetBackground(drawable);
-							break;
-					}
-				}
-			}
-		}
-
-		public static void EnsureId(this AView view)
-		{
-			if (view.IsDisposed())
-			{
-				return;
-			}
-
-			if (view.Id == AView.NoId)
-			{
-				view.Id = AppCompat.Platform.GenerateViewId();
-			}
-		}
-
-		public static bool GetClipToOutline(this AView view)
-		{
-			if (view.IsDisposed() || !Forms.IsLollipopOrNewer)
-				return false;
-
-			return view.ClipToOutline;
-		}
-
-		public static void SetClipToOutline(this AView view, bool value)
-		{
-			if (view.IsDisposed() || !Forms.IsLollipopOrNewer)
-				return;
-
-			view.ClipToOutline = value;
-		}
-
-		public static bool SetElevation(this AView view, float value)
-		{
-			if (view.IsDisposed() || !Forms.IsLollipopOrNewer)
-				return false;
-
-			view.Elevation = value;
-			return true;
-		}
-
 		internal static void MaybeRequestLayout(this AView view)
 		{
 			var isInLayout = false;
diff --git a/src/Compatibility/Core/src/Android/ViewRenderer.cs b/src/Compatibility/Core/src/Android/ViewRenderer.cs
index 571060be8478..fbeee2e8a4a5 100644
--- a/src/Compatibility/Core/src/Android/ViewRenderer.cs
+++ b/src/Compatibility/Core/src/Android/ViewRenderer.cs
@@ -3,6 +3,7 @@
 using Android.Content;
 using Android.Views;
 using Microsoft.Maui.Controls.Compatibility.Platform.Android.FastRenderers;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
 using AView = Android.Views.View;
 
@@ -96,7 +97,7 @@ void AView.IOnFocusChangeListener.OnFocusChange(AView v, bool hasFocus)
 
 				if (isInViewCell)
 				{
-					Window window = Context.GetActivity().Window;
+					var window = Context.GetActivity().Window;
 					if (hasFocus)
 					{
 						_startingInputMode = window.Attributes.SoftInputMode;
diff --git a/src/Compatibility/Core/src/Android/VisualElementPackager.cs b/src/Compatibility/Core/src/Android/VisualElementPackager.cs
index 67fb7b5dd0f4..29bc023ffde8 100644
--- a/src/Compatibility/Core/src/Android/VisualElementPackager.cs
+++ b/src/Compatibility/Core/src/Android/VisualElementPackager.cs
@@ -3,6 +3,7 @@
 using System.Collections.ObjectModel;
 using Android.Views;
 using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Controls.Platform;
 using AView = Android.Views.View;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.Android
diff --git a/src/Compatibility/Core/src/Android/VisualElementRenderer.cs b/src/Compatibility/Core/src/Android/VisualElementRenderer.cs
index 52d7de5d8b04..058ee15ca4c6 100644
--- a/src/Compatibility/Core/src/Android/VisualElementRenderer.cs
+++ b/src/Compatibility/Core/src/Android/VisualElementRenderer.cs
@@ -9,6 +9,7 @@
 using AndroidX.Core.View;
 using Microsoft.Maui.Controls.Compatibility.Platform.Android.FastRenderers;
 using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
 using AView = Android.Views.View;
 using Color = Microsoft.Maui.Graphics.Color;
diff --git a/src/Compatibility/Core/src/Android/VisualElementTracker.cs b/src/Compatibility/Core/src/Android/VisualElementTracker.cs
index d37da8819f65..1dc281f38f8b 100644
--- a/src/Compatibility/Core/src/Android/VisualElementTracker.cs
+++ b/src/Compatibility/Core/src/Android/VisualElementTracker.cs
@@ -105,7 +105,7 @@ public void UpdateLayout()
 			else if (aview is LayoutViewGroup && width == 0 && height == 0)
 			{
 				// Nothing to do here; just chill.
-			}	
+			}
 			else
 			{
 				Performance.Start(reference, "Measure");
@@ -332,6 +332,7 @@ void UpdateClip()
 			aView?.Invalidate();
 		}
 
+		[PortHandler]
 		void UpdateIsVisible()
 		{
 			VisualElement view = _renderer.Element;
diff --git a/src/Compatibility/Core/src/AppHostBuilderExtensions.cs b/src/Compatibility/Core/src/AppHostBuilderExtensions.cs
index 54edb25b2d22..1a18c6a5ebd4 100644
--- a/src/Compatibility/Core/src/AppHostBuilderExtensions.cs
+++ b/src/Compatibility/Core/src/AppHostBuilderExtensions.cs
@@ -1,13 +1,43 @@
+#nullable enable
 using System;
 using System.Collections.Generic;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Maui.Hosting;
 
 namespace Microsoft.Maui.Controls.Compatibility
 {
 	public static class AppHostBuilderExtensions
 	{
-		// This won't really be a thing once we have all the handlers built
-		static readonly List<Type> ControlsWithHandlers = new List<Type>
+		public static IAppHostBuilder UseFormsCompatibility(this IAppHostBuilder builder, bool registerRenderers = true)
+		{
+			// TODO: this hideousness is just until the dynamic handler registration is merged
+			FormsCompatBuilder? compatBuilder = null;
+			IMauiHandlersCollection? handlersCollection = null;
+			builder.ConfigureMauiHandlers(handlers =>
+			{
+				handlersCollection = handlers;
+				compatBuilder?.SetHandlersCollection(handlersCollection);
+			});
+
+			builder.ConfigureServices<FormsCompatBuilder>(compat =>
+			{
+				// TODO: this hideousness is just until the dynamic handler registration is merged
+				compatBuilder = compat;
+				if (handlersCollection != null)
+					compatBuilder.SetHandlersCollection(handlersCollection);
+
+				compat.UseCompatibilityRenderers = registerRenderers;
+			});
+
+			return builder;
+		}
+	}
+
+	class FormsCompatBuilder : IMauiServiceBuilder
+	{
+		// TODO: This won't really be a thing once we have all the handlers built
+		static readonly List<Type> ControlsWithHandlers = new()
 		{
 			typeof(Button),
 			typeof(ContentPage),
@@ -15,6 +45,7 @@ public static class AppHostBuilderExtensions
 			typeof(Label),
 			typeof(CheckBox),
 			typeof(Entry),
+			typeof(Image),
 			typeof(Switch),
 			typeof(Editor),
 			typeof(ActivityIndicator),
@@ -27,10 +58,25 @@ public static class AppHostBuilderExtensions
 			typeof(TimePicker),
 		};
 
-		public static IAppHostBuilder UseFormsCompatibility(this IAppHostBuilder builder, bool registerRenderers = true)
+		static readonly List<(Type Control, Type Renderer)> PendingRenderers = new();
+
+		IMauiHandlersCollection? _handlers;
+
+		public bool UseCompatibilityRenderers { get; set; }
+
+		public void SetHandlersCollection(IMauiHandlersCollection handlersCollection) =>
+			_handlers = handlersCollection;
+
+		public static void AddRenderer(Type control, Type renderer) =>
+			PendingRenderers.Add((control, renderer));
+
+		public void ConfigureServices(HostBuilderContext context, IServiceCollection services)
+		{
+		}
+
+		public void Configure(HostBuilderContext context, IServiceProvider services)
 		{
-			// TODO: This should not be immediately run, but rather a registered delegate with values
-			//       of the Context and LaunchActivatedEventArgs passed in.
+			CompatServiceProvider.SetServiceProvider(services);
 
 #if __ANDROID__
 			var options = new InitializationOptions(global::Android.App.Application.Context, null, null);
@@ -44,29 +90,28 @@ public static IAppHostBuilder UseFormsCompatibility(this IAppHostBuilder builder
 
 			Forms.Init(options);
 
-			if (registerRenderers)
-				builder.UseCompatibilityRenderers();
-
-			return builder;
-		}
-
-		public static IAppHostBuilder UseCompatibilityRenderers(this IAppHostBuilder builder)
-		{
-			Forms.RegisterCompatRenderers(
-				new[] { typeof(RendererToHandlerShim).Assembly },
-				typeof(RendererToHandlerShim).Assembly,
-				(controlType) =>
-				{
-					foreach (var type in ControlsWithHandlers)
+			if (UseCompatibilityRenderers)
+			{
+				Forms.RegisterCompatRenderers(
+					new[] { typeof(RendererToHandlerShim).Assembly },
+					typeof(RendererToHandlerShim).Assembly,
+					(controlType) =>
 					{
-						if (type.IsAssignableFrom(controlType))
-							return;
-					}
+						foreach (var type in ControlsWithHandlers)
+						{
+							if (type.IsAssignableFrom(controlType))
+								return;
+						}
 
-					builder.ConfigureMauiHandlers((_, handlersCollection) => handlersCollection.AddHandler(controlType, typeof(RendererToHandlerShim)));
-				});
+						_handlers?.AddHandler(controlType, typeof(RendererToHandlerShim));
+					});
+			}
 
-			return builder;
+			// register renderer with old registrar so it can get shimmed
+			foreach (var (control, renderer) in PendingRenderers)
+			{
+				Internals.Registrar.Registered.Register(control, renderer);
+			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Compatibility/Core/src/Compatibility-net6.csproj b/src/Compatibility/Core/src/Compatibility-net6.csproj
index 552c28389a8f..0df5eed659c8 100644
--- a/src/Compatibility/Core/src/Compatibility-net6.csproj
+++ b/src/Compatibility/Core/src/Compatibility-net6.csproj
@@ -15,7 +15,7 @@
 
   <PropertyGroup Condition="$(TargetFramework.Contains('-windows')) == true ">
     <NoWarn>$(NoWarn);CA1416;CS8305</NoWarn>
-    <DefineConstants>$(DefineConstants);WINDOWS_UWP;WINDOWS</DefineConstants>
+    <DefineConstants>$(DefineConstants);WINDOWS</DefineConstants>
     <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
   </PropertyGroup>
 
@@ -75,17 +75,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="..\..\..\Controls\src\Core\Crc64.cs">
-      <Link>Crc64.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\Controls\src\Core\StreamWrapper.cs">
-      <Link>StreamWrapper.cs</Link>
-    </Compile>
     <Compile Include="AppHostBuilderExtensions.cs" />
     <Compile Include="MauiHandlersCollectionExtensions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    
   </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
@@ -95,8 +89,4 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\Controls\src\Core\Controls.Core-net6.csproj" />
   </ItemGroup>
-  <ItemGroup Condition="$([MSBuild]::IsOSPlatform('windows'))">
-    <None Include="bin\$(Configuration)\$(WindowsTargetFramework)\Microsoft.Maui.Controls.Compatibility.pri" Visible="False" Pack="True" PackagePath="runtimes\$(WindowsTargetFramework)\native" />
-    <None Include="bin\$(Configuration)\$(WindowsTargetFramework)\Microsoft.Maui.Controls.Compatibility\**\*.xbf" Visible="False" Pack="True" PackagePath="lib\$(WindowsTargetFramework)\Microsoft.Maui.Controls.Compatibility\%(RecursiveDir)%(FileName)%(Extension);runtimes\$(WindowsTargetFramework)\native\Microsoft.Maui.Controls.Compatibility\%(RecursiveDir)%(FileName)%(Extension)" />
-  </ItemGroup>
 </Project>
diff --git a/src/Compatibility/Core/src/GTK/Compatibility.GTK.csproj b/src/Compatibility/Core/src/GTK/Compatibility.GTK.csproj
index d590e5baab81..4175f802f74d 100644
--- a/src/Compatibility/Core/src/GTK/Compatibility.GTK.csproj
+++ b/src/Compatibility/Core/src/GTK/Compatibility.GTK.csproj
@@ -98,12 +98,6 @@
     <PackageReference Include="OpenTK" Version="3.0.1" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Xamarin.Forms.Core\Crc64.cs">
-      <Link>Crc64.cs</Link>
-    </Compile>
-    <Compile Include="..\Xamarin.Forms.Core\StreamWrapper.cs">
-      <Link>StreamWrapper.cs</Link>
-    </Compile>
     <Compile Include="Animations\BaseAnimation.cs" />
     <Compile Include="Animations\FloatAnimation.cs" />
     <Compile Include="Cells\CellBase.cs" />
diff --git a/src/Compatibility/Core/src/MacOS/Compatibility.macOS.csproj b/src/Compatibility/Core/src/MacOS/Compatibility.macOS.csproj
index b4cf4f76e98c..002a434d93a1 100644
--- a/src/Compatibility/Core/src/MacOS/Compatibility.macOS.csproj
+++ b/src/Compatibility/Core/src/MacOS/Compatibility.macOS.csproj
@@ -76,12 +76,6 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\Xamarin.Forms.Core\Crc64.cs">
-      <Link>Crc64.cs</Link>
-    </Compile>
-    <Compile Include="..\Xamarin.Forms.Core\StreamWrapper.cs">
-      <Link>StreamWrapper.cs</Link>
-    </Compile>
     <Compile Include="..\iOS\Extensions\LabelExtensions.cs">
       <Link>Extensions\LabelExtensions.cs</Link>
     </Compile>
diff --git a/src/Compatibility/Core/src/MauiHandlersCollectionExtensions.cs b/src/Compatibility/Core/src/MauiHandlersCollectionExtensions.cs
index 16c813d38671..bde838b776a9 100644
--- a/src/Compatibility/Core/src/MauiHandlersCollectionExtensions.cs
+++ b/src/Compatibility/Core/src/MauiHandlersCollectionExtensions.cs
@@ -7,11 +7,7 @@ public static class MauiHandlersCollectionExtensions
 	{
 		public static IMauiHandlersCollection AddCompatibilityRenderer(this IMauiHandlersCollection handlersCollection, Type controlType, Type rendererType)
 		{
-			// register renderer with old registrar so it can get shimmed
-			// This will move to some extension method
-			Microsoft.Maui.Controls.Internals.Registrar.Registered.Register(
-				controlType,
-				rendererType);
+			FormsCompatBuilder.AddRenderer(controlType, rendererType);
 
 			handlersCollection.AddHandler(controlType, typeof(RendererToHandlerShim));
 
@@ -21,11 +17,7 @@ public static IMauiHandlersCollection AddCompatibilityRenderer(this IMauiHandler
 		public static IMauiHandlersCollection AddCompatibilityRenderer<TControlType, TMauiType, TRenderer>(this IMauiHandlersCollection handlersCollection)
 			where TMauiType : IFrameworkElement
 		{
-			// register renderer with old registrar so it can get shimmed
-			// This will move to some extension method
-			Controls.Internals.Registrar.Registered.Register(
-				typeof(TControlType),
-				typeof(TRenderer));
+			FormsCompatBuilder.AddRenderer(typeof(TControlType), typeof(TRenderer));
 
 			handlersCollection.AddHandler<TMauiType, RendererToHandlerShim>();
 
diff --git a/src/Compatibility/Core/src/WinUI/AccessibilityExtensions.cs b/src/Compatibility/Core/src/WinUI/AccessibilityExtensions.cs
index d7dc9c07763e..32b334ac86ab 100644
--- a/src/Compatibility/Core/src/WinUI/AccessibilityExtensions.cs
+++ b/src/Compatibility/Core/src/WinUI/AccessibilityExtensions.cs
@@ -6,91 +6,6 @@ namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
 	public static class AccessibilityExtensions
 	{
-		public static void SetAutomationPropertiesAutomationId(this FrameworkElement Control, string id)
-		{
-			Control.SetValue(NativeAutomationProperties.AutomationIdProperty, id);
-		}
-
-		public static string SetAutomationPropertiesName(this FrameworkElement Control, Element Element, string _defaultAutomationPropertiesName = null)
-		{
-			if (Element == null)
-				return _defaultAutomationPropertiesName;
-
-			if (_defaultAutomationPropertiesName == null)
-				_defaultAutomationPropertiesName = (string)Control.GetValue(NativeAutomationProperties.NameProperty);
-
-			var elemValue = (string)Element.GetValue(AutomationProperties.NameProperty);
-
-			if (!string.IsNullOrWhiteSpace(elemValue))
-				Control.SetValue(NativeAutomationProperties.NameProperty, elemValue);
-			else
-				Control.SetValue(NativeAutomationProperties.NameProperty, _defaultAutomationPropertiesName);
-
-			return _defaultAutomationPropertiesName;
-		}
-
-		public static AccessibilityView? SetAutomationPropertiesAccessibilityView(this FrameworkElement Control, Element Element, AccessibilityView? _defaultAutomationPropertiesAccessibilityView = null)
-		{
-			if (Element == null)
-				return _defaultAutomationPropertiesAccessibilityView;
-
-			if (!_defaultAutomationPropertiesAccessibilityView.HasValue)
-				_defaultAutomationPropertiesAccessibilityView = (AccessibilityView)Control.GetValue(NativeAutomationProperties.AccessibilityViewProperty);
-
-			var newValue = _defaultAutomationPropertiesAccessibilityView;
-
-			var elemValue = (bool?)Element.GetValue(AutomationProperties.IsInAccessibleTreeProperty);
-
-			if (elemValue == true)
-				newValue = AccessibilityView.Content;
-			else if (elemValue == false)
-				newValue = AccessibilityView.Raw;
-
-			Control.SetValue(NativeAutomationProperties.AccessibilityViewProperty, newValue);
-
-			return _defaultAutomationPropertiesAccessibilityView;
-
-		}
-		public static string SetAutomationPropertiesHelpText(this FrameworkElement Control, Element Element, string _defaultAutomationPropertiesHelpText = null)
-		{
-			if (Element == null)
-				return _defaultAutomationPropertiesHelpText;
-
-			if (_defaultAutomationPropertiesHelpText == null)
-				_defaultAutomationPropertiesHelpText = (string)Control.GetValue(NativeAutomationProperties.HelpTextProperty);
-
-			var elemValue = (string)Element.GetValue(AutomationProperties.HelpTextProperty);
-
-			if (!string.IsNullOrWhiteSpace(elemValue))
-				Control.SetValue(NativeAutomationProperties.HelpTextProperty, elemValue);
-			else
-				Control.SetValue(NativeAutomationProperties.HelpTextProperty, _defaultAutomationPropertiesHelpText);
-
-			return _defaultAutomationPropertiesHelpText;
-		}
-
-		public static UIElement SetAutomationPropertiesLabeledBy(this FrameworkElement Control, Element Element, UIElement _defaultAutomationPropertiesLabeledBy = null)
-		{
-			if (Element == null)
-				return _defaultAutomationPropertiesLabeledBy;
-
-			if (_defaultAutomationPropertiesLabeledBy == null)
-				_defaultAutomationPropertiesLabeledBy = (UIElement)Control.GetValue(NativeAutomationProperties.LabeledByProperty);
-
-			var elemValue = (VisualElement)Element.GetValue(AutomationProperties.LabeledByProperty);
-
-			var renderer = elemValue?.GetOrCreateRenderer();
-
-			var nativeElement = renderer?.GetNativeElement();
-
-			if (nativeElement != null)
-				Control.SetValue(AutomationProperties.LabeledByProperty, nativeElement);
-			else
-				Control.SetValue(NativeAutomationProperties.LabeledByProperty, _defaultAutomationPropertiesLabeledBy);
-
-			return _defaultAutomationPropertiesLabeledBy;
-		}
-
 		// TODO: This is not having any effect on anything I've tested yet. See if we need it  
 		// after we test the FP and NP w/ back button explicitly enabled. 
 		public static void SetBackButtonTitle(this PageControl Control, Element Element)
@@ -106,7 +21,7 @@ public static void SetBackButtonTitle(this PageControl Control, Element Element)
 		static string ConcatenateNameAndHint(Element Element)
 		{
 			string separator;
-			
+
 			var name = (string)Element.GetValue(AutomationProperties.NameProperty);
 
 			var hint = (string)Element.GetValue(AutomationProperties.HelpTextProperty);
@@ -122,17 +37,5 @@ static string ConcatenateNameAndHint(Element Element)
 			return string.Join(separator, name, hint);
 
 		}
-
-		internal static void SetAutomationProperties(
-			this FrameworkElement frameworkElement, 
-			Element element,
-			string defaultName = null)
-		{
-			frameworkElement.SetAutomationPropertiesAutomationId(element?.AutomationId);
-			 frameworkElement.SetAutomationPropertiesName(element, defaultName);
-			frameworkElement.SetAutomationPropertiesHelpText(element);
-			frameworkElement.SetAutomationPropertiesLabeledBy(element);
-			frameworkElement.SetAutomationPropertiesAccessibilityView(element);
-		}
 	}
 }
diff --git a/src/Compatibility/Core/src/WinUI/ActivityIndicatorRenderer.cs b/src/Compatibility/Core/src/WinUI/ActivityIndicatorRenderer.cs
index 145c3f2f72db..d29f3fe46077 100644
--- a/src/Compatibility/Core/src/WinUI/ActivityIndicatorRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/ActivityIndicatorRenderer.cs
@@ -1,6 +1,7 @@
 using System.ComponentModel;
 using Microsoft.Maui.Graphics;
 using Microsoft.UI.Xaml;
+using Microsoft.Maui.Controls.Platform;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
@@ -55,7 +56,7 @@ void UpdateColor()
 			}
 			else
 			{
-				Control.Foreground = color.ToBrush();
+				Control.Foreground = Maui.ColorExtensions.ToNative(color);
 			}
 		}
 
diff --git a/src/Compatibility/Core/src/WinUI/AlignmentExtensions.cs b/src/Compatibility/Core/src/WinUI/AlignmentExtensions.cs
index 1126276d13a3..ebfe86cb5aaf 100644
--- a/src/Compatibility/Core/src/WinUI/AlignmentExtensions.cs
+++ b/src/Compatibility/Core/src/WinUI/AlignmentExtensions.cs
@@ -37,6 +37,7 @@ internal static VerticalAlignment ToNativeVerticalAlignment(this TextAlignment a
 			}
 		}
 
+		[PortHandler]
 		internal static HorizontalAlignment ToNativeHorizontalAlignment(this TextAlignment alignment)
 		{
 			switch (alignment)
diff --git a/src/Compatibility/Core/src/WinUI/BackgroundTracker.cs b/src/Compatibility/Core/src/WinUI/BackgroundTracker.cs
index 5241cf756486..305b79ceaec2 100644
--- a/src/Compatibility/Core/src/WinUI/BackgroundTracker.cs
+++ b/src/Compatibility/Core/src/WinUI/BackgroundTracker.cs
@@ -1,5 +1,6 @@
 using System;
 using System.ComponentModel;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
@@ -64,7 +65,7 @@ async void UpdateBackground()
 					Color backgroundColor = Element.BackgroundColor;
 					if (!backgroundColor.IsDefault())
 					{
-						element.SetValue(_backgroundProperty, backgroundColor.ToBrush());
+						element.SetValue(_backgroundProperty, Maui.ColorExtensions.ToNative(backgroundColor));
 					}
 					else
 					{
diff --git a/src/Compatibility/Core/src/WinUI/BoxViewBorderRenderer.cs b/src/Compatibility/Core/src/WinUI/BoxViewBorderRenderer.cs
index cf6522a67461..df11e4f84f30 100644
--- a/src/Compatibility/Core/src/WinUI/BoxViewBorderRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/BoxViewBorderRenderer.cs
@@ -3,6 +3,7 @@
 using Microsoft.UI.Xaml.Automation.Peers;
 using Microsoft.UI.Xaml.Controls;
 using WShape = Microsoft.UI.Xaml.Shapes.Shape;
+using Microsoft.Maui.Controls.Platform;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
@@ -66,7 +67,7 @@ protected override void UpdateBackgroundColor()
 				backgroundColor = Element.BackgroundColor;
 			}
 
-			Control.Background = backgroundColor.IsDefault() ? null : backgroundColor.ToBrush();
+			Control.Background = backgroundColor.IsDefault() ? null : Maui.ColorExtensions.ToNative(backgroundColor);
 		}
 
 		protected override void UpdateBackground()
@@ -81,7 +82,7 @@ protected override void UpdateBackground()
 				Color backgroundColor = Element.BackgroundColor;
 
 				if (!backgroundColor.IsDefault())
-					Control.Background = backgroundColor.ToBrush();
+					Control.Background = Maui.ColorExtensions.ToNative(backgroundColor);
 				else
 				{
 					if (Element.Color.IsDefault())
@@ -97,7 +98,7 @@ void SetColor(Color color)
 			if (color.IsDefault())
 				UpdateBackground();
 			else
-				Control.Background = color.ToBrush();
+				Control.Background = Maui.ColorExtensions.ToNative(color);
 		}
 
 		void SetCornerRadius(CornerRadius cornerRadius)
diff --git a/src/Compatibility/Core/src/WinUI/BrushConverter.cs b/src/Compatibility/Core/src/WinUI/BrushConverter.cs
index 27e3c69ccb23..87d0c308132e 100644
--- a/src/Compatibility/Core/src/WinUI/BrushConverter.cs
+++ b/src/Compatibility/Core/src/WinUI/BrushConverter.cs
@@ -1,4 +1,5 @@
 using System;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
@@ -10,7 +11,7 @@ public object Convert(object value, Type targetType, object parameter, string la
 			var brush = value as Brush;
 			var color = (Color)parameter;
 
-			return Brush.IsNullOrEmpty(brush) ? color.ToBrush() : brush.ToBrush();
+			return Brush.IsNullOrEmpty(brush) ? Maui.ColorExtensions.ToNative(color) : brush.ToBrush();
 		}
 
 		public object ConvertBack(object value, Type targetType, object parameter, string language)
diff --git a/src/Compatibility/Core/src/WinUI/BrushHelpers.cs b/src/Compatibility/Core/src/WinUI/BrushHelpers.cs
index 5d9b9defaa2d..ec5fd42ccec2 100644
--- a/src/Compatibility/Core/src/WinUI/BrushHelpers.cs
+++ b/src/Compatibility/Core/src/WinUI/BrushHelpers.cs
@@ -1,4 +1,5 @@
 using System;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
 using WBrush = Microsoft.UI.Xaml.Media.Brush;
 
@@ -32,7 +33,7 @@ public static void UpdateColor(Color color, ref WBrush defaultbrush, Func<WBrush
 				defaultbrush = getter();
 			}
 
-			setter(color.ToBrush());
+			setter(Maui.ColorExtensions.ToNative(color));
 		}
 
 		public static void UpdateBrush(Brush brush, ref WBrush defaultbrush, Func<WBrush> getter, Action<WBrush> setter)
diff --git a/src/Compatibility/Core/src/WinUI/ButtonRenderer.cs b/src/Compatibility/Core/src/WinUI/ButtonRenderer.cs
index bf7322e7acc9..c9a90784bffa 100644
--- a/src/Compatibility/Core/src/WinUI/ButtonRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/ButtonRenderer.cs
@@ -8,8 +8,8 @@
 using WImage = Microsoft.UI.Xaml.Controls.Image;
 using WStretch = Microsoft.UI.Xaml.Media.Stretch;
 using WThickness = Microsoft.UI.Xaml.Thickness;
-using Microsoft.Maui.Controls.Compatibility.Platform.UAP.Extensions;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Controls.Platform;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
@@ -169,14 +169,14 @@ void OnPointerPressed(object sender, RoutedEventArgs e)
 		void UpdateBackgroundBrush()
 		{
 			if (Brush.IsNullOrEmpty(Element.Background))
-				Control.BackgroundColor = Element.BackgroundColor.IsNotDefault() ? Element.BackgroundColor.ToBrush() : (WBrush)Microsoft.UI.Xaml.Application.Current.Resources["ButtonBackgroundThemeBrush"];
+				Control.BackgroundColor = Element.BackgroundColor.IsNotDefault() ? Maui.ColorExtensions.ToNative(Element.BackgroundColor) : (WBrush)Microsoft.UI.Xaml.Application.Current.Resources["ButtonBackgroundThemeBrush"];
 			else
 				Control.BackgroundColor = Element.Background.ToBrush();
 		}
 
 		void UpdateBorderColor()
 		{
-			Control.BorderBrush = !Element.BorderColor.IsDefault() ? Element.BorderColor.ToBrush() : (WBrush)Microsoft.UI.Xaml.Application.Current.Resources["ButtonBorderThemeBrush"];
+			Control.BorderBrush = !Element.BorderColor.IsDefault() ? Maui.ColorExtensions.ToNative(Element.BorderColor) : (WBrush)Microsoft.UI.Xaml.Application.Current.Resources["ButtonBorderThemeBrush"];
 		}
 
 		void UpdateBorderRadius()
@@ -301,7 +301,7 @@ void UpdateFont()
 			if (Element.Font == Font.Default && !_fontApplied)
 				return;
 
-			Font fontToApply = Element.Font == Font.Default ? Font.SystemFontOfSize(NamedSize.Medium) : Element.Font;
+			Font fontToApply = Element.Font == Font.Default ? Font.SystemFontOfSize(Device.GetNamedSize(NamedSize.Medium, Element.GetType(), false)) : Element.Font;
 
 			Control.ApplyFont(fontToApply);
 			_fontApplied = true;
@@ -309,7 +309,7 @@ void UpdateFont()
 
 		void UpdateTextColor()
 		{
-			Control.Foreground = Element.TextColor.IsNotDefault() ? Element.TextColor.ToBrush() : (WBrush)Microsoft.UI.Xaml.Application.Current.Resources["DefaultTextForegroundThemeBrush"];
+			Control.Foreground = Element.TextColor.IsNotDefault() ? Maui.ColorExtensions.ToNative(Element.TextColor) : (WBrush)Microsoft.UI.Xaml.Application.Current.Resources["DefaultTextForegroundThemeBrush"];
 		}
 
 		void UpdatePadding()
diff --git a/src/Compatibility/Core/src/WinUI/CarouselPageRenderer.cs b/src/Compatibility/Core/src/WinUI/CarouselPageRenderer.cs
index d6bc57dcdcae..a175f787f6ae 100644
--- a/src/Compatibility/Core/src/WinUI/CarouselPageRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/CarouselPageRenderer.cs
@@ -6,6 +6,7 @@
 using Microsoft.Maui.Controls.Internals;
 using WSelectionChangedEventArgs = Microsoft.UI.Xaml.Controls.SelectionChangedEventArgs;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Controls.Platform;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
diff --git a/src/Compatibility/Core/src/WinUI/CheckBoxRenderer.cs b/src/Compatibility/Core/src/WinUI/CheckBoxRenderer.cs
index f04dd8336d0e..9b6c672dfc07 100644
--- a/src/Compatibility/Core/src/WinUI/CheckBoxRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/CheckBoxRenderer.cs
@@ -2,12 +2,13 @@
 using Microsoft.Maui.Graphics;
 using Microsoft.UI.Xaml;
 using WBrush = Microsoft.UI.Xaml.Media.Brush;
+using Microsoft.Maui.Controls.Platform;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
 	public class CheckBoxRenderer : ViewRenderer<CheckBox, FormsCheckBox>
 	{
-		static WBrush _tintDefaultBrush = Colors.Blue.ToBrush();
+		static WBrush _tintDefaultBrush = Maui.ColorExtensions.ToNative(Colors.Blue);
 		bool _disposed = false;
 
 		protected virtual FormsCheckBox CreateNativeControl()
diff --git a/src/Compatibility/Core/src/WinUI/CollectionView/CarouselViewRenderer.cs b/src/Compatibility/Core/src/WinUI/CollectionView/CarouselViewRenderer.cs
index fe883432616d..7e275e40bf7d 100644
--- a/src/Compatibility/Core/src/WinUI/CollectionView/CarouselViewRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/CollectionView/CarouselViewRenderer.cs
@@ -4,6 +4,7 @@
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Threading.Tasks;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.UI.Composition;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Data;
diff --git a/src/Compatibility/Core/src/WinUI/CollectionView/FormsGridView.cs b/src/Compatibility/Core/src/WinUI/CollectionView/FormsGridView.cs
index 46cc6fb20844..c376c45c7659 100644
--- a/src/Compatibility/Core/src/WinUI/CollectionView/FormsGridView.cs
+++ b/src/Compatibility/Core/src/WinUI/CollectionView/FormsGridView.cs
@@ -4,6 +4,7 @@
 using UWPApp = Microsoft.UI.Xaml.Application;
 using UWPControls = Microsoft.UI.Xaml.Controls;
 using WScrollMode = Microsoft.UI.Xaml.Controls.ScrollMode;
+using WVisibility = Microsoft.UI.Xaml.Visibility;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
@@ -41,11 +42,11 @@ public int Span
 
 		public static readonly DependencyProperty EmptyViewVisibilityProperty =
 			DependencyProperty.Register(nameof(EmptyViewVisibility), typeof(Visibility),
-				typeof(FormsGridView), new PropertyMetadata(Visibility.Collapsed));
+				typeof(FormsGridView), new PropertyMetadata(WVisibility.Collapsed));
 
-		public Visibility EmptyViewVisibility
+		public WVisibility EmptyViewVisibility
 		{
-			get { return (Visibility)GetValue(EmptyViewVisibilityProperty); }
+			get { return (WVisibility)GetValue(EmptyViewVisibilityProperty); }
 			set { SetValue(EmptyViewVisibilityProperty, value); }
 		}
 
diff --git a/src/Compatibility/Core/src/WinUI/CollectionView/FormsListView.cs b/src/Compatibility/Core/src/WinUI/CollectionView/FormsListView.cs
index b5890f0787c4..c15ef7f2d0ed 100644
--- a/src/Compatibility/Core/src/WinUI/CollectionView/FormsListView.cs
+++ b/src/Compatibility/Core/src/WinUI/CollectionView/FormsListView.cs
@@ -4,6 +4,7 @@
 using UwpApp = Microsoft.UI.Xaml.Application;
 using UwpControlTemplate = Microsoft.UI.Xaml.Controls.ControlTemplate;
 using UwpScrollBarVisibility = Microsoft.UI.Xaml.Controls.ScrollBarVisibility;
+using WVisibility = Microsoft.UI.Xaml.Visibility;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
@@ -25,11 +26,11 @@ public FormsListView()
 
 		public static readonly DependencyProperty EmptyViewVisibilityProperty =
 			DependencyProperty.Register(nameof(EmptyViewVisibility), typeof(Visibility),
-				typeof(FormsListView), new PropertyMetadata(Visibility.Collapsed));
+				typeof(FormsListView), new PropertyMetadata(WVisibility.Collapsed));
 
-		public Visibility EmptyViewVisibility
+		public WVisibility EmptyViewVisibility
 		{
-			get { return (Visibility)GetValue(EmptyViewVisibilityProperty); }
+			get { return (WVisibility)GetValue(EmptyViewVisibilityProperty); }
 			set { SetValue(EmptyViewVisibilityProperty, value); }
 		}
 
diff --git a/src/Compatibility/Core/src/WinUI/CollectionView/IEmptyView.cs b/src/Compatibility/Core/src/WinUI/CollectionView/IEmptyView.cs
index aa0c21535395..ffe237e83e61 100644
--- a/src/Compatibility/Core/src/WinUI/CollectionView/IEmptyView.cs
+++ b/src/Compatibility/Core/src/WinUI/CollectionView/IEmptyView.cs
@@ -1,10 +1,11 @@
 using Microsoft.UI.Xaml;
+using WVisibility = Microsoft.UI.Xaml.Visibility;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
 	internal interface IEmptyView
 	{
-		Visibility EmptyViewVisibility { get; set; }
+		WVisibility EmptyViewVisibility { get; set; }
 		void SetEmptyView(FrameworkElement emptyView, View formsEmptyView);
 	}
 }
\ No newline at end of file
diff --git a/src/Compatibility/Core/src/WinUI/CollectionView/ItemContentControl.cs b/src/Compatibility/Core/src/WinUI/CollectionView/ItemContentControl.cs
index 6b456229c40b..c40c5d210041 100644
--- a/src/Compatibility/Core/src/WinUI/CollectionView/ItemContentControl.cs
+++ b/src/Compatibility/Core/src/WinUI/CollectionView/ItemContentControl.cs
@@ -5,6 +5,7 @@
 using WThickness = Microsoft.UI.Xaml.Thickness;
 using WSize = Windows.Foundation.Size;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Controls.Platform;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
diff --git a/src/Compatibility/Core/src/WinUI/CollectionView/ItemsViewRenderer.cs b/src/Compatibility/Core/src/WinUI/CollectionView/ItemsViewRenderer.cs
index 77c98e77896e..17b6a0038254 100644
--- a/src/Compatibility/Core/src/WinUI/CollectionView/ItemsViewRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/CollectionView/ItemsViewRenderer.cs
@@ -12,6 +12,8 @@
 using UwpScrollBarVisibility = Microsoft.UI.Xaml.Controls.ScrollBarVisibility;
 using WRect = Windows.Foundation.Rect;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Controls.Platform;
+using WVisibility = Microsoft.UI.Xaml.Visibility;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
@@ -471,7 +473,7 @@ protected virtual void UpdateEmptyViewVisibility()
 
 				if (_emptyView != null && ListViewBase is IEmptyView emptyView)
 				{
-					emptyView.EmptyViewVisibility = Visibility.Visible;
+					emptyView.EmptyViewVisibility = WVisibility.Visible;
 
 					if (ActualWidth >= 0 && ActualHeight >= 0)
 						_formsEmptyView?.Layout(new Rectangle(0, 0, ActualWidth, ActualHeight));
@@ -484,7 +486,7 @@ protected virtual void UpdateEmptyViewVisibility()
 				if (_emptyViewDisplayed)
 				{
 					if (_emptyView != null && ListViewBase is IEmptyView emptyView)
-						emptyView.EmptyViewVisibility = Visibility.Collapsed;
+						emptyView.EmptyViewVisibility = WVisibility.Collapsed;
 
 					ItemsView.RemoveLogicalChild(_formsEmptyView);
 				}
@@ -581,7 +583,7 @@ bool IsElementVisibleInContainer(FrameworkElement element, FrameworkElement cont
 			if (element == null || container == null)
 				return false;
 
-			if (element.Visibility != Visibility.Visible)
+			if (element.Visibility != WVisibility.Visible)
 				return false;
 
 			var elementBounds = element.TransformToVisual(container).TransformBounds(new WRect(0, 0, element.ActualWidth, element.ActualHeight));
diff --git a/src/Compatibility/Core/src/WinUI/CollectionView/StructuredItemsViewRenderer.cs b/src/Compatibility/Core/src/WinUI/CollectionView/StructuredItemsViewRenderer.cs
index 6140b80d0129..fbf3f5b9d650 100644
--- a/src/Compatibility/Core/src/WinUI/CollectionView/StructuredItemsViewRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/CollectionView/StructuredItemsViewRenderer.cs
@@ -1,6 +1,6 @@
 using System;
 using System.ComponentModel;
-
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.UI.Xaml.Controls;
 
 using UWPApp = Microsoft.UI.Xaml.Application;
diff --git a/src/Compatibility/Core/src/WinUI/ColorConverter.cs b/src/Compatibility/Core/src/WinUI/ColorConverter.cs
index 11ced5914ea4..9bd25803bf62 100644
--- a/src/Compatibility/Core/src/WinUI/ColorConverter.cs
+++ b/src/Compatibility/Core/src/WinUI/ColorConverter.cs
@@ -1,4 +1,5 @@
 using System;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.UI;
 using Windows.UI;
 using WBrush = Microsoft.UI.Xaml.Media.Brush;
@@ -15,7 +16,7 @@ public object Convert(object value, Type targetType, object parameter, string la
 
 			WBrush defaultBrush = defaultColorKey != null ? (WBrush)Microsoft.UI.Xaml.Application.Current.Resources[defaultColorKey] : new WSolidColorBrush(Colors.Transparent);
 
-			return color.IsDefault() ? defaultBrush : color.ToBrush();
+			return color.IsDefault() ? defaultBrush : Maui.ColorExtensions.ToNative(color);
 		}
 
 		public object ConvertBack(object value, Type targetType, object parameter, string language)
diff --git a/src/Compatibility/Core/src/WinUI/ColorExtensions.cs b/src/Compatibility/Core/src/WinUI/ColorExtensions.cs
deleted file mode 100644
index ca6031e241a0..000000000000
--- a/src/Compatibility/Core/src/WinUI/ColorExtensions.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using Windows.UI;
-using Microsoft.UI;
-using Microsoft.Maui.Graphics;
-using WBrush = Microsoft.UI.Xaml.Media.Brush;
-using WSolidColorBrush = Microsoft.UI.Xaml.Media.SolidColorBrush;
-
-namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
-{
-	public static class ColorExtensions
-	{
-		public static Windows.UI.Color GetContrastingColor(this Windows.UI.Color color)
-		{
-			var nThreshold = 105;
-			int bgLuminance = Convert.ToInt32(color.R * 0.2 + color.G * 0.7 + color.B * 0.1);
-
-			Windows.UI.Color contrastingColor = 255 - bgLuminance < nThreshold ? UI.Colors.Black : UI.Colors.White;
-			return contrastingColor;
-		}
-
-		public static Graphics.Color ToFormsColor(this Windows.UI.Color color)
-		{
-			return Graphics.Color.FromRgba(color.R, color.G, color.B, color.A);
-		}
-
-		public static Graphics.Color ToFormsColor(this WSolidColorBrush solidColorBrush)
-		{
-			return solidColorBrush.Color.ToFormsColor();
-		}
-
-		public static WBrush ToBrush(this Graphics.Color color)
-		{
-			return new WSolidColorBrush(color.ToWindowsColor());
-		}
-
-		public static Windows.UI.Color ToWindowsColor(this Graphics.Color color)
-		{
-			return Windows.UI.Color.FromArgb((byte)(color.Alpha * 255), (byte)(color.Red * 255), (byte)(color.Green * 255), (byte)(color.Blue * 255));
-		}
-	}
-}
diff --git a/src/Compatibility/Core/src/WinUI/Compatibility.UAP.csproj b/src/Compatibility/Core/src/WinUI/Compatibility.UAP.csproj
index ea9077fb2854..4c8d29098993 100644
--- a/src/Compatibility/Core/src/WinUI/Compatibility.UAP.csproj
+++ b/src/Compatibility/Core/src/WinUI/Compatibility.UAP.csproj
@@ -1,14 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <TargetFramework Condition=" '$(OS)' == 'Windows_NT' ">net5.0-windows10.0.18362.0</TargetFramework>
     <TargetFramework Condition=" '$(OS)' != 'Windows_NT' ">netstandard2.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
     <RootNamespace>Microsoft.Maui.Controls.Compatibility.UAP</RootNamespace>
     <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
-    <DefineConstants>$(DefineConstants);DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;UWP_16299;UWP_18362;UWP_17134</DefineConstants>
+    <DefineConstants>$(DefineConstants);DEBUG;TRACE;NETFX_CORE;WINDOWS;UWP_16299;UWP_18362;UWP_17134</DefineConstants>
     <NoWarn>$(NoWarn);NU5104</NoWarn>
   </PropertyGroup>
-  
+
   <PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
@@ -17,11 +18,7 @@
   <ItemGroup Condition=" '$(OS)' == 'Windows_NT'">
     <PackageReference Include="Microsoft.WinUI" Version="3.0.0-preview3.201113.0" />
   </ItemGroup>
-  
-  <ItemGroup>
-    <Compile Include="..\..\..\..\Controls\src\Core\Crc64.cs" Link="Crc64.cs" />
-    <Compile Include="..\..\..\..\Controls\src\Core\StreamWrapper.cs" Link="StreamWrapper.cs" />
-  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Controls\src\Core\Controls.Core.csproj">
     </ProjectReference>
@@ -29,4 +26,9 @@
     </ProjectReference>
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="..\AppHostBuilderExtensions.cs" Link="AppHostBuilderExtensions.cs" />
+    <Compile Include="..\MauiHandlersCollectionExtensions.cs" Link="MauiHandlersCollectionExtensions.cs" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Compatibility/Core/src/WinUI/DatePickerRenderer.cs b/src/Compatibility/Core/src/WinUI/DatePickerRenderer.cs
index 617062cea71f..08771edfa0ad 100644
--- a/src/Compatibility/Core/src/WinUI/DatePickerRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/DatePickerRenderer.cs
@@ -10,6 +10,7 @@
 using Microsoft.Maui.Controls.Internals;
 using WBrush = Microsoft.UI.Xaml.Media.Brush;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Controls.Platform;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
@@ -144,6 +145,7 @@ bool CheckDateFormat()
 			return String.IsNullOrWhiteSpace(Element.Format) || Element.Format.Equals("d");
 		}
 
+		[PortHandler]
 		void UpdateDate(DateTime date)
 		{
 			if (Control != null)
@@ -154,6 +156,7 @@ void UpdateDate(DateTime date)
 			UpdateYear();
 		}
 
+		[PortHandler]
 		void UpdateMonth()
 		{
 			Control.MonthVisible = true;
@@ -179,6 +182,7 @@ void UpdateMonth()
 			}
 		}
 
+		[PortHandler]
 		void UpdateDay()
 		{
 			Control.DayVisible = true;
@@ -204,6 +208,7 @@ void UpdateDay()
 			}
 		}
 
+		[PortHandler]
 		void UpdateYear()
 		{
 			Control.YearVisible = true;
@@ -298,7 +303,7 @@ void UpdateMinimumDate()
 		void UpdateTextColor()
 		{
 			Color color = Element.TextColor;
-			Control.Foreground = color.IsDefault() ? (_defaultBrush ?? color.ToBrush()) : color.ToBrush();
+			Control.Foreground = color.IsDefault() ? (_defaultBrush ?? Maui.ColorExtensions.ToNative(color)) : Maui.ColorExtensions.ToNative(color);
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Compatibility/Core/src/WinUI/EditorRenderer.cs b/src/Compatibility/Core/src/WinUI/EditorRenderer.cs
index d3dd0a063610..cf280f897991 100644
--- a/src/Compatibility/Core/src/WinUI/EditorRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/EditorRenderer.cs
@@ -8,6 +8,7 @@
 using WBrush = Microsoft.UI.Xaml.Media.Brush;
 using Specifics = Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific.InputView;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Controls.Platform;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
@@ -156,11 +157,13 @@ protected override void UpdateBackground()
 			   () => Control.BackgroundFocusBrush, brush => Control.BackgroundFocusBrush = brush);
 		}
 
+		[PortHandler]
 		void OnLostFocus(object sender, RoutedEventArgs e)
 		{
 			ElementController.SendCompleted();
 		}
 
+		[PortHandler]
 		void UpdatePlaceholderText()
 		{
 			Control.PlaceholderText = Element.Placeholder ?? "";
@@ -275,6 +278,7 @@ void UpdateCharacterSpacing()
 			Control.CharacterSpacing = Element.CharacterSpacing.ToEm();
 		}
 	
+		[PortHandler]
 		void UpdateText()
 		{
 			string newText = _transformedText = Element.UpdateFormsText(Element.Text, Element.TextTransform);
@@ -304,6 +308,7 @@ void UpdateFlowDirection()
 			Control.UpdateFlowDirection(Element);
 		}
 
+		[PortHandler]
 		void UpdateMaxLength()
 		{
 			Control.MaxLength = Element.MaxLength;
@@ -329,6 +334,7 @@ void UpdateDetectReadingOrderFromContent()
 			}
 		}
 
+		[PortHandler]
 		void UpdateIsReadOnly()
 		{
 			Control.IsReadOnly = Element.IsReadOnly;
diff --git a/src/Compatibility/Core/src/WinUI/EmbeddedFontLoader.cs b/src/Compatibility/Core/src/WinUI/EmbeddedFontLoader.cs
deleted file mode 100644
index a15ba14ce021..000000000000
--- a/src/Compatibility/Core/src/WinUI/EmbeddedFontLoader.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.IO;
-using Windows.Storage;
-using IOPath = System.IO.Path;
-
-namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
-{
-	public class EmbeddedFontLoader : IEmbeddedFontLoader
-	{
-		const string _fontCacheFolderName = "fonts";
-		public (bool success, string filePath) LoadFont(EmbeddedFont font)
-		{
-			try
-			{
-				var t = ApplicationData.Current.LocalFolder.CreateFolderAsync(_fontCacheFolderName, CreationCollisionOption.OpenIfExists);
-				var tmpdir = t.AsTask().Result;
-
-				var file = tmpdir.TryGetItemAsync(font.FontName).AsTask().Result;
-				string filePath = "";
-				if (file != null)
-				{
-					filePath = file.Path;
-					return (true, CleanseFilePath(filePath));
-				}
-
-				try
-				{
-
-					var f = tmpdir.CreateFileAsync(font.FontName).AsTask().Result;
-					filePath = f.Path;
-					using (var fileStream = File.Open(f.Path, FileMode.Open))
-					{
-						font.ResourceStream.CopyTo(fileStream);
-					}
-					return (true, CleanseFilePath(filePath));
-				}
-				catch (Exception ex)
-				{
-					Debug.WriteLine(ex);
-					File.Delete(filePath);
-				}
-			}
-			catch (Exception e)
-			{
-				Debug.WriteLine(e);
-			}
-			return (false, null);
-		}
-
-		static string CleanseFilePath(string filePath)
-		{
-			var fontName = IOPath.GetFileName(filePath);
-			filePath = IOPath.Combine("local", _fontCacheFolderName, fontName);
-			var baseUri = new Uri("ms-appdata://");
-			var uri = new Uri(baseUri, filePath);
-			var relativePath = uri.ToString().TrimEnd('/');
-			return relativePath;
-		}
-	}
-}
diff --git a/src/Compatibility/Core/src/WinUI/EntryRenderer.cs b/src/Compatibility/Core/src/WinUI/EntryRenderer.cs
index ec4f19cb293b..ed0395b9e4dc 100644
--- a/src/Compatibility/Core/src/WinUI/EntryRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/EntryRenderer.cs
@@ -10,6 +10,7 @@
 using WBrush = Microsoft.UI.Xaml.Media.Brush;
 using Specifics = Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific.InputView;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Controls.Platform;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
@@ -279,6 +280,7 @@ void UpdateIsPassword()
 			Control.IsPassword = Element.IsPassword;
 		}
 
+		[PortHandler]
 		void UpdatePlaceholder()
 		{
 			Control.PlaceholderText = Element.Placeholder ?? "";
@@ -295,6 +297,7 @@ void UpdatePlaceholderColor()
 				() => Control.PlaceholderForegroundFocusBrush, brush => Control.PlaceholderForegroundFocusBrush = brush);
 		}
 
+		[PortHandler]
 		void UpdateText()
 		{
 			Control.Text = _transformedText = Element.UpdateFormsText(Element.Text, Element.TextTransform);
@@ -311,6 +314,7 @@ void UpdateTextColor()
 				() => Control.ForegroundFocusBrush, brush => Control.ForegroundFocusBrush = brush);
 		}
 
+		[PortHandler]
 		void UpdateMaxLength()
 		{
 			var maxLength = Element.MaxLength;
@@ -472,6 +476,7 @@ void SetSelectionLengthFromRenderer(int selectionLength)
 			}
 		}
 
+		[PortHandler]
 		void UpdateIsReadOnly()
 		{
 			Control.IsReadOnly = Element.IsReadOnly;
diff --git a/src/Compatibility/Core/src/WinUI/Extensions/ClipExtensions.cs b/src/Compatibility/Core/src/WinUI/Extensions/ClipExtensions.cs
index b2d0af0d0cc0..09a6e5bf528c 100644
--- a/src/Compatibility/Core/src/WinUI/Extensions/ClipExtensions.cs
+++ b/src/Compatibility/Core/src/WinUI/Extensions/ClipExtensions.cs
@@ -6,6 +6,7 @@
 using Microsoft.UI.Xaml.Hosting;
 using Microsoft.Maui.Controls.Shapes;
 using WRectangleGeometry = Microsoft.UI.Xaml.Media.RectangleGeometry;
+using Microsoft.Maui.Controls.Platform;
 
 #if UWP_18362
 using WVector2 = System.Numerics.Vector2;
@@ -17,7 +18,7 @@ internal static class ClipExtensions
 	{
 		public static void Clip(this FrameworkElement frameworkElement, Geometry geometry)
 		{
-			var wGeometry = geometry.ToWindows();
+			var wGeometry = geometry.ToNative();
 
 			if (wGeometry is WRectangleGeometry wRectangleGeometry && frameworkElement.Clip != wRectangleGeometry)
 				frameworkElement.Clip = wRectangleGeometry;
diff --git a/src/Compatibility/Core/src/WinUI/Extensions/ImageExtensions.cs b/src/Compatibility/Core/src/WinUI/Extensions/ImageExtensions.cs
index 4c8ac8733108..f71cc89d9a0a 100644
--- a/src/Compatibility/Core/src/WinUI/Extensions/ImageExtensions.cs
+++ b/src/Compatibility/Core/src/WinUI/Extensions/ImageExtensions.cs
@@ -11,6 +11,7 @@
 using Microsoft.UI.Xaml.Media;
 using Microsoft.Maui.Controls.Internals;
 using WImageSource = Microsoft.UI.Xaml.Media.ImageSource;
+using Microsoft.Maui.Controls.Platform;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
diff --git a/src/Compatibility/Core/src/WinUI/FileImageSourceHandler.cs b/src/Compatibility/Core/src/WinUI/FileImageSourceHandler.cs
index 8c99ea9fdadb..d0baecfd3e1a 100644
--- a/src/Compatibility/Core/src/WinUI/FileImageSourceHandler.cs
+++ b/src/Compatibility/Core/src/WinUI/FileImageSourceHandler.cs
@@ -5,6 +5,7 @@
 using Microsoft.UI.Xaml.Media.Imaging;
 using Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific;
 using IOPath = System.IO.Path;
+using Microsoft.Maui.Controls.Platform;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
diff --git a/src/Compatibility/Core/src/WinUI/FlyoutPageControl.cs b/src/Compatibility/Core/src/WinUI/FlyoutPageControl.cs
index f82c84fda98d..51ec23442755 100644
--- a/src/Compatibility/Core/src/WinUI/FlyoutPageControl.cs
+++ b/src/Compatibility/Core/src/WinUI/FlyoutPageControl.cs
@@ -5,6 +5,7 @@
 using Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific;
 using WBrush = Microsoft.UI.Xaml.Media.Brush;
 using WImageSource = Microsoft.UI.Xaml.Media.ImageSource;
+using WVisibility = Microsoft.UI.Xaml.Visibility;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
@@ -82,7 +83,7 @@ public FlyoutPageControl()
 		{
 			DefaultStyleKey = typeof(FlyoutPageControl);
 
-			DetailTitleVisibility = Visibility.Collapsed;
+			DetailTitleVisibility = WVisibility.Collapsed;
 
 			CollapseStyle = CollapseStyle.Full;
 		}
@@ -133,9 +134,9 @@ public View DetailTitleView
 			set { SetValue(DetailTitleViewProperty, value); }
 		}
 
-		public Visibility DetailTitleVisibility
+		public WVisibility DetailTitleVisibility
 		{
-			get { return (Visibility)GetValue(DetailTitleVisibilityProperty); }
+			get { return (WVisibility)GetValue(DetailTitleVisibilityProperty); }
 			set { SetValue(DetailTitleVisibilityProperty, value); }
 		}
 
@@ -187,15 +188,15 @@ public string FlyoutTitle
 			set { SetValue(FlyoutTitleProperty, value); }
 		}
 
-		public Visibility FlyoutTitleVisibility
+		public WVisibility FlyoutTitleVisibility
 		{
-			get { return (Visibility)GetValue(FlyoutTitleVisibilityProperty); }
+			get { return (WVisibility)GetValue(FlyoutTitleVisibilityProperty); }
 			set { SetValue(FlyoutTitleVisibilityProperty, value); }
 		}
 
-		public Visibility FlyoutToolbarVisibility
+		public WVisibility FlyoutToolbarVisibility
 		{
-			get { return (Visibility)GetValue(FlyoutToolbarVisibilityProperty); }
+			get { return (WVisibility)GetValue(FlyoutToolbarVisibilityProperty); }
 			set { SetValue(FlyoutToolbarVisibilityProperty, value); }
 		}
 
@@ -231,9 +232,9 @@ public bool ToolbarDynamicOverflowEnabled
 			}
 		}
 
-		public Visibility ContentTogglePaneButtonVisibility
+		public WVisibility ContentTogglePaneButtonVisibility
 		{
-			get { return (Visibility)GetValue(ContentTogglePaneButtonVisibilityProperty); }
+			get { return (WVisibility)GetValue(ContentTogglePaneButtonVisibilityProperty); }
 			set { SetValue(ContentTogglePaneButtonVisibilityProperty, value); }
 		}
 
@@ -349,20 +350,20 @@ void UpdateMode()
 			{
 				// If we've determined that the pane will always be open, then there's no
 				// reason to display the show/hide pane button in the master
-				FlyoutToolbarVisibility = Visibility.Collapsed;
+				FlyoutToolbarVisibility = WVisibility.Collapsed;
 			}
 
 			// If we're in compact mode or the pane is always open,
 			// we don't need to display the content pane's toggle button
 			ContentTogglePaneButtonVisibility = _split.DisplayMode == SplitViewDisplayMode.Overlay
-				? Visibility.Visible
-				: Visibility.Collapsed;
+				? WVisibility.Visible
+				: WVisibility.Collapsed;
 
-			if (ContentTogglePaneButtonVisibility == Visibility.Visible)
-				DetailTitleVisibility = Visibility.Visible;
+			if (ContentTogglePaneButtonVisibility == WVisibility.Visible)
+				DetailTitleVisibility = WVisibility.Visible;
 
-			if (DetailTitleVisibility == Visibility.Visible && !ShouldShowNavigationBar)
-				DetailTitleVisibility = Visibility.Collapsed;
+			if (DetailTitleVisibility == WVisibility.Visible && !ShouldShowNavigationBar)
+				DetailTitleVisibility = WVisibility.Collapsed;
 
 			_firstLoad = true;
 		}
@@ -401,13 +402,13 @@ public string MasterTitle
 			set => FlyoutTitle = value;
 		}
 
-		public Visibility MasterTitleVisibility
+		public WVisibility MasterTitleVisibility
 		{
 			get => FlyoutTitleVisibility;
 			set => FlyoutTitleVisibility = value;
 		}
 
-		public Visibility MasterToolbarVisibility
+		public WVisibility MasterToolbarVisibility
 		{
 			get => FlyoutToolbarVisibility;
 			set => FlyoutToolbarVisibility = value;
diff --git a/src/Compatibility/Core/src/WinUI/FlyoutPageRenderer.cs b/src/Compatibility/Core/src/WinUI/FlyoutPageRenderer.cs
index d2a4abcdd28a..351723c3bc8d 100644
--- a/src/Compatibility/Core/src/WinUI/FlyoutPageRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/FlyoutPageRenderer.cs
@@ -10,6 +10,8 @@
 using WBrush = Microsoft.UI.Xaml.Media.Brush;
 using WImageSource = Microsoft.UI.Xaml.Media.ImageSource;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Controls.Platform;
+using WVisibility = Microsoft.UI.Xaml.Visibility;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
@@ -75,7 +77,7 @@ bool ITitleProvider.ShowTitle
 					return;
 
 				_showTitle = value;
-				Control.DetailTitleVisibility = _showTitle ? Visibility.Visible : Visibility.Collapsed;
+				Control.DetailTitleVisibility = _showTitle ? WVisibility.Visible : WVisibility.Collapsed;
 			}
 		}
 
@@ -184,7 +186,7 @@ protected virtual void OnElementChanged(ElementChangedEventArgs<FlyoutPage> e)
 
 				_defaultAutomationPropertiesName = Control.SetAutomationPropertiesName(Element, _defaultAutomationPropertiesName);
 				_defaultAutomationPropertiesHelpText = Control.SetAutomationPropertiesHelpText(Element, _defaultAutomationPropertiesHelpText);
-				_defaultAutomationPropertiesLabeledBy = Control.SetAutomationPropertiesLabeledBy(Element, _defaultAutomationPropertiesLabeledBy);
+				_defaultAutomationPropertiesLabeledBy = Control.SetAutomationPropertiesLabeledBy(Element, Element.Handler?.MauiContext ?? Forms.MauiContext,  _defaultAutomationPropertiesLabeledBy);
 				_defaultAutomationPropertiesAccessibilityView = Control.SetAutomationPropertiesAccessibilityView(Element, _defaultAutomationPropertiesAccessibilityView);
 			}
 		}
@@ -212,7 +214,7 @@ protected virtual void OnElementPropertyChanged(object sender, PropertyChangedEv
 			else if (e.PropertyName == AutomationProperties.HelpTextProperty.PropertyName)
 				_defaultAutomationPropertiesHelpText = Control.SetAutomationPropertiesHelpText(Element, _defaultAutomationPropertiesHelpText);
 			else if (e.PropertyName == AutomationProperties.LabeledByProperty.PropertyName)
-				_defaultAutomationPropertiesLabeledBy = Control.SetAutomationPropertiesLabeledBy(Element, _defaultAutomationPropertiesLabeledBy);
+				_defaultAutomationPropertiesLabeledBy = Control.SetAutomationPropertiesLabeledBy(Element, Element.Handler?.MauiContext ?? Forms.MauiContext, _defaultAutomationPropertiesLabeledBy);
 			else if (e.PropertyName == AutomationProperties.IsInAccessibleTreeProperty.PropertyName)
 				_defaultAutomationPropertiesAccessibilityView = Control.SetAutomationPropertiesAccessibilityView(Element, _defaultAutomationPropertiesAccessibilityView);
 		}
diff --git a/src/Compatibility/Core/src/WinUI/FontExtensions.cs b/src/Compatibility/Core/src/WinUI/FontExtensions.cs
index 2e1d4f7863b9..026ea0b8a696 100644
--- a/src/Compatibility/Core/src/WinUI/FontExtensions.cs
+++ b/src/Compatibility/Core/src/WinUI/FontExtensions.cs
@@ -1,6 +1,6 @@
+using System;
 using Microsoft.Maui.Controls.Internals;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Documents;
 using Microsoft.UI.Xaml.Media;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
@@ -8,28 +8,40 @@ namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 	public static class FontExtensions
 	{
 		public static void ApplyFont(this Control self, Font font) =>
-			self.UpdateFont(font, Forms.FontManager);
+			self.UpdateFont(font, CompatServiceProvider.FontManager);
 
 		public static void ApplyFont(this TextBlock self, Font font) =>
-			self.UpdateFont(font, Forms.FontManager);
+			self.UpdateFont(font, CompatServiceProvider.FontManager);
 
 		public static FontFamily ToFontFamily(this Font font) =>
-			Forms.FontManager.GetFontFamily(font);
+			CompatServiceProvider.FontManager.GetFontFamily(font);
 
 		public static FontFamily ToFontFamily(this string fontFamily) =>
-			Forms.FontManager.GetFontFamily(Font.OfSize(fontFamily, 0.0));
+			CompatServiceProvider.FontManager.GetFontFamily(Font.OfSize(fontFamily, 0.0));
 
 		internal static void ApplyFont(this Control self, IFontElement element) =>
-			self.UpdateFont(element.AsFont(), Forms.FontManager);
+			self.UpdateFont(element.AsFont(), CompatServiceProvider.FontManager);
 
 		internal static void ApplyFont(this TextBlock self, IFontElement element) =>
-			self.UpdateFont(element.AsFont(), Forms.FontManager);
-
-		internal static void ApplyFont(this TextElement self, IFontElement element) =>
-			self.UpdateFont(element.AsFont(), Forms.FontManager);
-
-		internal static double GetFontSize(this NamedSize size) =>
-			Forms.FontManager.GetFontSize(Font.OfSize(null, size));
+			self.UpdateFont(element.AsFont(), CompatServiceProvider.FontManager);
+
+		internal static void ApplyFont(this UI.Xaml.Documents.TextElement self, IFontElement element) =>
+			self.UpdateFont(element.AsFont(), CompatServiceProvider.FontManager);
+
+		internal static double GetFontSize(this NamedSize size) => size switch
+		{
+			NamedSize.Default => CompatServiceProvider.FontManager.DefaultFontSize,
+			NamedSize.Micro => 15.667,
+			NamedSize.Small => 18.667,
+			NamedSize.Medium => 22.667,
+			NamedSize.Large => 32,
+			NamedSize.Body => 14,
+			NamedSize.Caption => 12,
+			NamedSize.Header => 46,
+			NamedSize.Subtitle => 20,
+			NamedSize.Title => 24,
+			_ => throw new ArgumentOutOfRangeException(nameof(size)),
+		};
 
 		internal static bool IsDefault(this IFontElement self) =>
 			self.FontFamily == null && self.FontSize == Device.GetNamedSize(NamedSize.Default, typeof(Label), true) && self.FontAttributes == FontAttributes.None;
diff --git a/src/Compatibility/Core/src/WinUI/FontImageSourceHandler.cs b/src/Compatibility/Core/src/WinUI/FontImageSourceHandler.cs
index c32cb67fdf19..3c22f09eb81f 100644
--- a/src/Compatibility/Core/src/WinUI/FontImageSourceHandler.cs
+++ b/src/Compatibility/Core/src/WinUI/FontImageSourceHandler.cs
@@ -4,6 +4,7 @@
 using Microsoft.Graphics.Canvas;
 using Microsoft.Graphics.Canvas.Text;
 using Microsoft.Graphics.Canvas.UI.Xaml;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
@@ -68,7 +69,7 @@ public sealed class FontImageSourceHandler : IImageSourceHandler, IIconElementHa
 				{
 					Glyph = fontImageSource.Glyph,
 					FontSize = fontImageSource.Size,
-					Foreground = fontImageSource.Color.ToBrush()
+					Foreground = Maui.ColorExtensions.ToNative(fontImageSource.Color)
 				};
 
 				var uwpFontFamily = fontImageSource.FontFamily.ToFontFamily();
@@ -90,7 +91,7 @@ public sealed class FontImageSourceHandler : IImageSourceHandler, IIconElementHa
 				{
 					Glyph = fontImageSource.Glyph,
 					FontSize = fontImageSource.Size,
-					Foreground = fontImageSource.Color.ToBrush()
+					Foreground = Maui.ColorExtensions.ToNative(fontImageSource.Color)
 				};
 
 				var uwpFontFamily = fontImageSource.FontFamily.ToFontFamily();
diff --git a/src/Compatibility/Core/src/WinUI/Forms.cs b/src/Compatibility/Core/src/WinUI/Forms.cs
index 69b49ce340bc..d161400cfd9f 100644
--- a/src/Compatibility/Core/src/WinUI/Forms.cs
+++ b/src/Compatibility/Core/src/WinUI/Forms.cs
@@ -27,14 +27,10 @@ public static partial class Forms
 	{
 		const string LogFormat = "[{0}] {1}";
 		private static ApplicationExecutionState s_state;
-		private static IFontManager s_fontManager;
 
 		//TODO WINUI3 This is set by main page currently because
 		// it's only a single window
-		public static Window MainWindow { get; set; }
-
-		internal static IFontManager FontManager =>
-			s_fontManager ??= new FontManager(Registrar.FontRegistrar);
+		public static UI.Xaml.Window MainWindow { get; set; }
 
 		public static bool IsInitialized { get; private set; }
 		public static IMauiContext MauiContext { get; private set; }
@@ -66,15 +62,12 @@ static void SetupInit(
 			Registrar.RegisterRendererToHandlerShim(RendererToHandlerShim.CreateShim);
 
 			var accent = (WSolidColorBrush)Microsoft.UI.Xaml.Application.Current.Resources["SystemColorControlAccentBrush"];
-			KnownColor.SetAccent(accent.ToFormsColor());
+			KnownColor.SetAccent(accent.ToColor());
 
 			if (!IsInitialized)
 			{
-#if !UWP_16299
 				Log.Listeners.Add(new DelegateLogListener((c, m) => Debug.WriteLine(LogFormat, c, m)));
-#else
-				Log.Listeners.Add(new DelegateLogListener((c, m) => Trace.WriteLine(m, c)));
-#endif
+
 			}
 
 			if (!UI.Xaml.Application.Current.Resources.ContainsKey("RootContainerStyle"))
diff --git a/src/Compatibility/Core/src/WinUI/FormsButton.cs b/src/Compatibility/Core/src/WinUI/FormsButton.cs
index baf56bbe0a52..32351437ad04 100644
--- a/src/Compatibility/Core/src/WinUI/FormsButton.cs
+++ b/src/Compatibility/Core/src/WinUI/FormsButton.cs
@@ -1,3 +1,4 @@
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
diff --git a/src/Compatibility/Core/src/WinUI/FormsCommandBar.cs b/src/Compatibility/Core/src/WinUI/FormsCommandBar.cs
index 474c232cd4de..01534427cf95 100644
--- a/src/Compatibility/Core/src/WinUI/FormsCommandBar.cs
+++ b/src/Compatibility/Core/src/WinUI/FormsCommandBar.cs
@@ -4,6 +4,7 @@
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Data;
 using Microsoft.UI.Xaml.Media;
+using WVisibility = Microsoft.UI.Xaml.Visibility;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
@@ -60,26 +61,26 @@ void UpdateVisibility()
 			{
 				// If there's no title to display (e.g., toolbarplacement is set to bottom)
 				// or the title is collapsed (e.g., because it's empty)
-				if (frameworkElement == null || frameworkElement.Visibility != Visibility.Visible)
+				if (frameworkElement == null || frameworkElement.Visibility != WVisibility.Visible)
 				{
 					// Just collapse the whole thing
-					Visibility = Visibility.Collapsed;
+					Visibility = WVisibility.Collapsed;
 					return;
 				}
 			
 				// The title needs to be visible, but we're not allowed to show a toolbar
 				// So we need to hide the toolbar items
 
-				Visibility = Visibility.Visible;
+				Visibility = WVisibility.Visible;
 
 				if (_moreButton != null)
 				{
-					_moreButton.Visibility = Visibility.Collapsed;
+					_moreButton.Visibility = WVisibility.Collapsed;
 				}
 
 				if (_primaryItemsControl != null)
 				{
-					_primaryItemsControl.Visibility = Visibility.Collapsed;
+					_primaryItemsControl.Visibility = WVisibility.Collapsed;
 				}
 
 				return;
@@ -90,11 +91,11 @@ void UpdateVisibility()
 			if (_primaryItemsControl != null)
 			{
 				// This is normally visible by default, but it might have been collapsed by the toolbar consistency rules above
-				_primaryItemsControl.Visibility = Visibility.Visible;
+				_primaryItemsControl.Visibility = WVisibility.Visible;
 			}
 
 			// Are there any commands to display?
-			var visibility = PrimaryCommands.Count + SecondaryCommands.Count > 0 ? Visibility.Visible : Visibility.Collapsed;
+			var visibility = PrimaryCommands.Count + SecondaryCommands.Count > 0 ? WVisibility.Visible : WVisibility.Collapsed;
 
 			if (_moreButton != null)
 			{
@@ -105,10 +106,10 @@ void UpdateVisibility()
 				// but it became available in 10.0.14393.0 and we have to support 10.0.10240
 			}
 			
-			if (frameworkElement != null && frameworkElement.Visibility != Visibility.Collapsed)
+			if (frameworkElement != null && frameworkElement.Visibility != WVisibility.Collapsed)
 			{
 				// If there's a title to display, we have to be visible whether or not we have commands
-				Visibility = Visibility.Visible;
+				Visibility = WVisibility.Visible;
 			}
 			else
 			{
diff --git a/src/Compatibility/Core/src/WinUI/FormsFlyout.xaml.cs b/src/Compatibility/Core/src/WinUI/FormsFlyout.xaml.cs
index 5bfa46a558ff..351c8178a263 100644
--- a/src/Compatibility/Core/src/WinUI/FormsFlyout.xaml.cs
+++ b/src/Compatibility/Core/src/WinUI/FormsFlyout.xaml.cs
@@ -3,6 +3,7 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.Maui.Controls.Internals;
+using WVisibility = Microsoft.UI.Xaml.Visibility;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
@@ -54,8 +55,8 @@ public FormsFlyout(ActionSheetArguments sheetOptions)
 					RightBtn.Content = options.Destruction;
 			}
 
-			LeftBtn.Visibility = LeftBtn.Content == null ? Visibility.Collapsed : Visibility.Visible;
-			RightBtn.Visibility = RightBtn.Content == null ? Visibility.Collapsed : Visibility.Visible;
+			LeftBtn.Visibility = LeftBtn.Content == null ? WVisibility.Collapsed : WVisibility.Visible;
+			RightBtn.Visibility = RightBtn.Content == null ? WVisibility.Collapsed : WVisibility.Visible;
 		}
 
 		void ListItemSelected (object sender, ItemClickEventArgs e)
diff --git a/src/Compatibility/Core/src/WinUI/FormsRadioButton.cs b/src/Compatibility/Core/src/WinUI/FormsRadioButton.cs
index 2abaa58d92eb..1b0888cdf1e7 100644
--- a/src/Compatibility/Core/src/WinUI/FormsRadioButton.cs
+++ b/src/Compatibility/Core/src/WinUI/FormsRadioButton.cs
@@ -1,3 +1,4 @@
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
 using Microsoft.UI.Xaml;
 using WBrush = Microsoft.UI.Xaml.Media.Brush;
diff --git a/src/Compatibility/Core/src/WinUI/FormsSlider.cs b/src/Compatibility/Core/src/WinUI/FormsSlider.cs
index 7b4a7dec3f35..74d7c5463ed2 100644
--- a/src/Compatibility/Core/src/WinUI/FormsSlider.cs
+++ b/src/Compatibility/Core/src/WinUI/FormsSlider.cs
@@ -4,6 +4,7 @@
 using Microsoft.UI.Xaml.Controls.Primitives;
 using Microsoft.UI.Xaml.Media.Imaging;
 using WImageSource = Microsoft.UI.Xaml.Media.ImageSource;
+using WVisibility = Microsoft.UI.Xaml.Visibility;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
@@ -32,13 +33,13 @@ static void SwapThumbs(FormsSlider slider)
 
 			if (slider.ThumbImageSource != null)
 			{
-				slider.Thumb.Visibility = Visibility.Collapsed;
-				slider.ImageThumb.Visibility = Visibility.Visible;
+				slider.Thumb.Visibility = WVisibility.Collapsed;
+				slider.ImageThumb.Visibility = WVisibility.Visible;
 			}
 			else
 			{
-				slider.Thumb.Visibility = Visibility.Visible;
-				slider.ImageThumb.Visibility = Visibility.Collapsed;
+				slider.Thumb.Visibility = WVisibility.Visible;
+				slider.ImageThumb.Visibility = WVisibility.Collapsed;
 			}
 		}
 
diff --git a/src/Compatibility/Core/src/WinUI/FrameRenderer.cs b/src/Compatibility/Core/src/WinUI/FrameRenderer.cs
index 36d23a3094ea..46c3fe094118 100644
--- a/src/Compatibility/Core/src/WinUI/FrameRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/FrameRenderer.cs
@@ -3,6 +3,7 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Automation.Peers;
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.Maui.Controls.Platform;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
@@ -67,7 +68,7 @@ protected override void UpdateBackgroundColor()
 			if (Control != null)
 			{
 				Control.Background = backgroundColor.IsDefault() ? 
-					new Microsoft.UI.Xaml.Media.SolidColorBrush((Windows.UI.Color)Resources["SystemAltHighColor"]) : backgroundColor.ToBrush();
+					new Microsoft.UI.Xaml.Media.SolidColorBrush((Windows.UI.Color)Resources["SystemAltHighColor"]) : Maui.ColorExtensions.ToNative(backgroundColor);
 			}
 		}
 
@@ -80,7 +81,7 @@ protected override void UpdateBackground()
 			{
 				if (Brush.IsNullOrEmpty(background))
 					Control.Background = backgroundColor.IsDefault() ?
-						new Microsoft.UI.Xaml.Media.SolidColorBrush((Windows.UI.Color)Resources["SystemAltHighColor"]) : backgroundColor.ToBrush();
+						new Microsoft.UI.Xaml.Media.SolidColorBrush((Windows.UI.Color)Resources["SystemAltHighColor"]) : Maui.ColorExtensions.ToNative(backgroundColor);
 				else
 					Control.Background = background.ToBrush();
 			}
@@ -99,12 +100,12 @@ void UpdateBorder()
 		{
 			if (Element.BorderColor.IsNotDefault())
 			{
-				Control.BorderBrush = Element.BorderColor.ToBrush();
+				Control.BorderBrush = Maui.ColorExtensions.ToNative(Element.BorderColor);
 				Control.BorderThickness = WinUIHelpers.CreateThickness(1);
 			}
 			else
 			{
-				Control.BorderBrush = new Color(0, 0, 0, 0).ToBrush();
+				Control.BorderBrush = Maui.ColorExtensions.ToNative(new Color(0, 0, 0, 0));
 			}
 		}
 
diff --git a/src/Compatibility/Core/src/WinUI/HandlerToRendererShim.cs b/src/Compatibility/Core/src/WinUI/HandlerToRendererShim.cs
index 2c1a59c59666..aea95c42ee47 100644
--- a/src/Compatibility/Core/src/WinUI/HandlerToRendererShim.cs
+++ b/src/Compatibility/Core/src/WinUI/HandlerToRendererShim.cs
@@ -4,6 +4,7 @@
 using Microsoft.Maui.Controls.Compatibility.Platform.UWP;
 using Microsoft.UI.Xaml;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Controls.Platform;
 
 namespace Microsoft.Maui.Controls.Compatibility
 {
@@ -55,7 +56,7 @@ public void SetElement(VisualElement element)
 
 		void OnBatchCommitted(object sender, EventArg<VisualElement> e)
 		{
-			ViewHandler?.SetFrame(Element.Bounds);
+			ViewHandler?.NativeArrange(Element.Bounds);
 		}
 
 		void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
diff --git a/src/Compatibility/Core/src/WinUI/IDontGetFocus.cs b/src/Compatibility/Core/src/WinUI/IDontGetFocus.cs
deleted file mode 100644
index 58311370770a..000000000000
--- a/src/Compatibility/Core/src/WinUI/IDontGetFocus.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
-{
-	public interface IDontGetFocus
-	{
-	}
-}
diff --git a/src/Compatibility/Core/src/WinUI/ITabStopOnDescendants.cs b/src/Compatibility/Core/src/WinUI/ITabStopOnDescendants.cs
deleted file mode 100644
index 0f6dcbef0a93..000000000000
--- a/src/Compatibility/Core/src/WinUI/ITabStopOnDescendants.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
-{
-	public interface ITabStopOnDescendants: IDontGetFocus
-	{
-	}
-}
diff --git a/src/Compatibility/Core/src/WinUI/IVisualElementRenderer.cs b/src/Compatibility/Core/src/WinUI/IVisualElementRenderer.cs
index 7ca4eec57cc3..45d7a501bac2 100644
--- a/src/Compatibility/Core/src/WinUI/IVisualElementRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/IVisualElementRenderer.cs
@@ -1,4 +1,5 @@
 using System;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.UI.Xaml;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
diff --git a/src/Compatibility/Core/src/WinUI/ImageButtonRenderer.cs b/src/Compatibility/Core/src/WinUI/ImageButtonRenderer.cs
index 9998c7fa6e87..fe413103b3d8 100644
--- a/src/Compatibility/Core/src/WinUI/ImageButtonRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/ImageButtonRenderer.cs
@@ -10,6 +10,7 @@
 using WStretch = Microsoft.UI.Xaml.Media.Stretch;
 using WThickness = Microsoft.UI.Xaml.Thickness;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Controls.Platform;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
@@ -251,14 +252,14 @@ void OnPointerPressed(object sender, RoutedEventArgs e)
 		void UpdateImageButtonBackground()
 		{
 			if (Brush.IsNullOrEmpty(Element.Background))
-				Control.BackgroundColor = Element.BackgroundColor.IsNotDefault() ? Element.BackgroundColor.ToBrush() : (WBrush)Microsoft.UI.Xaml.Application.Current.Resources["ButtonBackgroundThemeBrush"];
+				Control.BackgroundColor = Element.BackgroundColor.IsNotDefault() ? Maui.ColorExtensions.ToNative(Element.BackgroundColor) : (WBrush)Microsoft.UI.Xaml.Application.Current.Resources["ButtonBackgroundThemeBrush"];
 			else
 				Control.BackgroundColor = Element.Background.ToBrush();
 		}
 
 		void UpdateBorderColor()
 		{
-			Control.BorderBrush = Element.BorderColor.IsNotDefault() ? Element.BorderColor.ToBrush() : (WBrush)Microsoft.UI.Xaml.Application.Current.Resources["ButtonBorderThemeBrush"];
+			Control.BorderBrush = Element.BorderColor.IsNotDefault() ? Maui.ColorExtensions.ToNative(Element.BorderColor) : (WBrush)Microsoft.UI.Xaml.Application.Current.Resources["ButtonBorderThemeBrush"];
 		}
 
 		void UpdateBorderRadius()
diff --git a/src/Compatibility/Core/src/WinUI/ImageElementManager.cs b/src/Compatibility/Core/src/WinUI/ImageElementManager.cs
index f34e1d1fcb0c..65da9d3f0ea2 100644
--- a/src/Compatibility/Core/src/WinUI/ImageElementManager.cs
+++ b/src/Compatibility/Core/src/WinUI/ImageElementManager.cs
@@ -6,6 +6,7 @@
 using Microsoft.Maui.Controls.Internals;
 using Microsoft.Maui.Controls.Compatibility.Platform.UWP;
 using WStretch = Microsoft.UI.Xaml.Media.Stretch;
+using Microsoft.Maui.Controls.Platform;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
diff --git a/src/Compatibility/Core/src/WinUI/ImageRenderer.cs b/src/Compatibility/Core/src/WinUI/ImageRenderer.cs
index 4b7b6184198f..aaf61113d241 100644
--- a/src/Compatibility/Core/src/WinUI/ImageRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/ImageRenderer.cs
@@ -3,6 +3,7 @@
 using System.Threading.Tasks;
 using Microsoft.UI.Xaml;
 using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Controls.Platform;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
@@ -87,13 +88,13 @@ void OnImageOpened(object sender, RoutedEventArgs routedEventArgs)
 				ImageElementManager.RefreshImage(this);
 			}
 
-			Element?.SetIsLoading(false);
+			((IImageController)Element)?.SetIsLoading(false);
 		}
 
 		protected virtual void OnImageFailed(object sender, ExceptionRoutedEventArgs exceptionRoutedEventArgs)
 		{
 			Log.Warning("Image Loading", $"Image failed to load: {exceptionRoutedEventArgs.ErrorMessage}");
-			Element?.SetIsLoading(false);
+			((IImageController)Element)?.SetIsLoading(false);
 		}
 
 		protected virtual async Task TryUpdateSource()
diff --git a/src/Compatibility/Core/src/WinUI/IndicatorViewRenderer.cs b/src/Compatibility/Core/src/WinUI/IndicatorViewRenderer.cs
index d066210c1bad..8b55ff481017 100644
--- a/src/Compatibility/Core/src/WinUI/IndicatorViewRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/IndicatorViewRenderer.cs
@@ -8,6 +8,7 @@
 using WEllipse = Microsoft.UI.Xaml.Shapes.Ellipse;
 using WRectangle = Microsoft.UI.Xaml.Shapes.Rectangle;
 using WShape = Microsoft.UI.Xaml.Shapes.Shape;
+using Microsoft.Maui.Controls.Platform;
 using WSolidColorBrush = Microsoft.UI.Xaml.Media.SolidColorBrush;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
diff --git a/src/Compatibility/Core/src/WinUI/LabelRenderer.cs b/src/Compatibility/Core/src/WinUI/LabelRenderer.cs
index 8d09894bead3..29916837157f 100644
--- a/src/Compatibility/Core/src/WinUI/LabelRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/LabelRenderer.cs
@@ -9,12 +9,12 @@
 using Microsoft.UI.Xaml.Documents;
 using Windows.UI.Text;
 using Microsoft.Maui.Controls.Compatibility.Platform.UAP;
-using Microsoft.Maui.Controls.Compatibility.Platform.UAP.Extensions;
 using Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific;
 using Specifics = Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific.Label;
 using WRect = Windows.Foundation.Rect;
 using WThickness = Microsoft.UI.Xaml.Thickness;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Controls.Platform;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
@@ -25,7 +25,7 @@ public static Run ToRun(this Span span)
 			var run = new Run { Text = span.Text ?? string.Empty };
 
 			if (span.TextColor.IsNotDefault())
-				run.Foreground = span.TextColor.ToBrush();
+				run.Foreground = Maui.ColorExtensions.ToNative(span.TextColor);
 
 			if (!span.IsDefault())
 				run.ApplyFont(span);
@@ -247,7 +247,7 @@ void UpdateColor(TextBlock textBlock)
 			Label label = Element;
 			if (label != null && label.TextColor.IsNotDefault())
 			{
-				textBlock.Foreground = label.TextColor.ToBrush();
+				textBlock.Foreground = Maui.ColorExtensions.ToNative(label.TextColor);
 			}
 			else
 			{
@@ -267,7 +267,7 @@ void UpdateFont(TextBlock textBlock)
 				return;
 
 			if (label.IsDefault() && _isInitiallyDefault)
-				textBlock.ApplyFont(Font.SystemFontOfSize(NamedSize.Medium));
+				textBlock.ApplyFont(Font.SystemFontOfSize(Device.GetNamedSize(NamedSize.Medium, Element.GetType(), false)));
 			else
 				textBlock.ApplyFont(label);
 
diff --git a/src/Compatibility/Core/src/WinUI/LayoutRenderer.cs b/src/Compatibility/Core/src/WinUI/LayoutRenderer.cs
index 6e3e1b0584a6..ade47c3f9a25 100644
--- a/src/Compatibility/Core/src/WinUI/LayoutRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/LayoutRenderer.cs
@@ -6,6 +6,7 @@
 using WRect = Windows.Foundation.Rect;
 using WSolidColorBrush = Microsoft.UI.Xaml.Media.SolidColorBrush;
 using Microsoft.UI;
+using Microsoft.Maui.Controls.Platform;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
diff --git a/src/Compatibility/Core/src/WinUI/ListViewRenderer.cs b/src/Compatibility/Core/src/WinUI/ListViewRenderer.cs
index 4ad43768a022..fab01fb474ca 100644
--- a/src/Compatibility/Core/src/WinUI/ListViewRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/ListViewRenderer.cs
@@ -21,6 +21,7 @@
 using Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific;
 using Specifics = Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific.ListView;
 using System.Collections.ObjectModel;
+using Microsoft.Maui.Controls.Platform;
 using UwpScrollBarVisibility = Microsoft.UI.Xaml.Controls.ScrollBarVisibility;
 using WSelectionChangedEventArgs = Microsoft.UI.Xaml.Controls.SelectionChangedEventArgs;
 
diff --git a/src/Compatibility/Core/src/WinUI/MasterBackgroundConverter.cs b/src/Compatibility/Core/src/WinUI/MasterBackgroundConverter.cs
index 63b427b2e529..4be2b83c36bf 100644
--- a/src/Compatibility/Core/src/WinUI/MasterBackgroundConverter.cs
+++ b/src/Compatibility/Core/src/WinUI/MasterBackgroundConverter.cs
@@ -38,7 +38,7 @@ public object Convert(object value, Type targetType, object parameter, string la
 			brush = value as WSolidColorBrush;
 			if (brush != null)
 			{
-				Maui.Graphics.Color color = brush.ToFormsColor();
+				Maui.Graphics.Color color = brush.ToColor();
 
 				double delta = Shift;
 				if (color.GetLuminosity() > .6)
diff --git a/src/Compatibility/Core/src/WinUI/NativeViewWrapperRenderer.cs b/src/Compatibility/Core/src/WinUI/NativeViewWrapperRenderer.cs
index cb9e2f2dc636..b13e90946da3 100644
--- a/src/Compatibility/Core/src/WinUI/NativeViewWrapperRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/NativeViewWrapperRenderer.cs
@@ -1,5 +1,6 @@
 using Microsoft.UI.Xaml;
 using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Controls.Platform;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
diff --git a/src/Compatibility/Core/src/WinUI/NavigationPageRenderer.cs b/src/Compatibility/Core/src/WinUI/NavigationPageRenderer.cs
index a014c698006c..07d072672d10 100644
--- a/src/Compatibility/Core/src/WinUI/NavigationPageRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/NavigationPageRenderer.cs
@@ -16,6 +16,7 @@
 using WBrush = Microsoft.UI.Xaml.Media.Brush;
 using WImageSource = Microsoft.UI.Xaml.Media.ImageSource;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Controls.Platform;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
@@ -281,7 +282,7 @@ WBrush GetBarBackgroundColorBrush()
 
 			if (Element.BarBackgroundColor.IsDefault() && defaultColor != null)
 				return (WBrush)defaultColor;
-			return Element.BarBackgroundColor.ToBrush();
+			return Maui.ColorExtensions.ToNative(Element.BarBackgroundColor);
 		}
 
 		WBrush GetBarBackgroundBrush()
@@ -303,7 +304,7 @@ WBrush GetBarForegroundBrush()
 			object defaultColor = Microsoft.UI.Xaml.Application.Current.Resources["ApplicationForegroundThemeBrush"];
 			if (Element.BarTextColor.IsDefault())
 				return (WBrush)defaultColor;
-			return Element.BarTextColor.ToBrush();
+			return Maui.ColorExtensions.ToNative(Element.BarTextColor);
 		}
 
 		bool GetIsNavBarPossible()
diff --git a/src/Compatibility/Core/src/WinUI/PageControl.cs b/src/Compatibility/Core/src/WinUI/PageControl.cs
index 444efc6548f9..71e925179b14 100644
--- a/src/Compatibility/Core/src/WinUI/PageControl.cs
+++ b/src/Compatibility/Core/src/WinUI/PageControl.cs
@@ -4,12 +4,13 @@
 using Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific;
 using WBrush = Microsoft.UI.Xaml.Media.Brush;
 using WImageSource = Microsoft.UI.Xaml.Media.ImageSource;
+using WVisibility = Microsoft.UI.Xaml.Visibility;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
 	public sealed class PageControl : ContentControl, IToolbarProvider, ITitleViewRendererController
 	{
-		public static readonly DependencyProperty TitleVisibilityProperty = DependencyProperty.Register(nameof(TitleVisibility), typeof(Visibility), typeof(PageControl), new PropertyMetadata(Visibility.Visible));
+		public static readonly DependencyProperty TitleVisibilityProperty = DependencyProperty.Register(nameof(TitleVisibility), typeof(WVisibility), typeof(PageControl), new PropertyMetadata(WVisibility.Visible));
 
 		public static readonly DependencyProperty ToolbarBackgroundProperty = DependencyProperty.Register(nameof(ToolbarBackground), typeof(WBrush), typeof(PageControl),
 			new PropertyMetadata(default(WBrush)));
@@ -23,7 +24,7 @@ public sealed class PageControl : ContentControl, IToolbarProvider, ITitleViewRe
 
 		public static readonly DependencyProperty TitleViewProperty = DependencyProperty.Register(nameof(TitleView), typeof(View), typeof(PageControl), new PropertyMetadata(default(View), OnTitleViewPropertyChanged));
 
-		public static readonly DependencyProperty TitleViewVisibilityProperty = DependencyProperty.Register(nameof(TitleViewVisibility), typeof(Visibility), typeof(PageControl), new PropertyMetadata(Visibility.Collapsed));
+		public static readonly DependencyProperty TitleViewVisibilityProperty = DependencyProperty.Register(nameof(TitleViewVisibility), typeof(WVisibility), typeof(PageControl), new PropertyMetadata(WVisibility.Collapsed));
 
 		public static readonly DependencyProperty TitleInsetProperty = DependencyProperty.Register("TitleInset", typeof(double), typeof(PageControl), new PropertyMetadata(default(double)));
 
diff --git a/src/Compatibility/Core/src/WinUI/PageRenderer.cs b/src/Compatibility/Core/src/WinUI/PageRenderer.cs
index 21d142f696c8..7cd725c8c2bd 100644
--- a/src/Compatibility/Core/src/WinUI/PageRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/PageRenderer.cs
@@ -4,6 +4,7 @@
 using Microsoft.UI.Xaml.Automation.Peers;
 using Microsoft.UI.Xaml.Controls;
 using System;
+using Microsoft.Maui.Controls.Platform;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
diff --git a/src/Compatibility/Core/src/WinUI/PickerRenderer.cs b/src/Compatibility/Core/src/WinUI/PickerRenderer.cs
index 3100a5005b87..55ac868295b6 100644
--- a/src/Compatibility/Core/src/WinUI/PickerRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/PickerRenderer.cs
@@ -8,6 +8,7 @@
 using WBrush = Microsoft.UI.Xaml.Media.Brush;
 using WSelectionChangedEventArgs = Microsoft.UI.Xaml.Controls.SelectionChangedEventArgs;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Controls.Platform;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
@@ -124,6 +125,7 @@ void ControlOnOpenAnimationCompleted(object sender, EventArgs eventArgs)
 			}
 		}
 
+		[PortHandler]
 		void OnControlSelectionChanged(object sender, WSelectionChangedEventArgs e)
 		{
 			if (Element != null)
@@ -172,11 +174,13 @@ void StartAnimationRefresh()
 			});
 		}
 
+		[PortHandler]
 		void UpdateCharacterSpacing()
 		{
 			Control.CharacterSpacing = Element.CharacterSpacing.ToEm();
 		}
 
+		[PortHandler]
 		void UpdateFont()
 		{
 			if (Control == null)
@@ -210,17 +214,20 @@ void UpdateFont()
 			_fontApplied = true;
 		}
 
+		[PortHandler]
 		void UpdateSelectedIndex()
 		{
 			Control.SelectedIndex = Element.SelectedIndex;
 		}
 
+		[PortHandler]
 		void UpdateTextColor()
 		{
 			Color color = Element.TextColor;
-			Control.Foreground = color.IsDefault() ? (_defaultBrush ?? color.ToBrush()) : color.ToBrush();
+			Control.Foreground = color.IsDefault() ? (_defaultBrush ?? Maui.ColorExtensions.ToNative(color)) : Maui.ColorExtensions.ToNative(color);
 		}
 
+		[PortHandler]
 		void UpdateTitle()
 		{
 			Control.Header = null;
@@ -228,10 +235,12 @@ void UpdateTitle()
 			Control.DataContext = Element;
 		}
 
+		[PortHandler]
 		void UpdateHorizontalTextAlignment()
 		{
 			Control.HorizontalContentAlignment = Element.HorizontalTextAlignment.ToNativeHorizontalAlignment();
 		}
+
 		void UpdateVerticalTextAlignment()
 		{
 			Control.VerticalContentAlignment = Element.VerticalTextAlignment.ToNativeVerticalAlignment();
diff --git a/src/Compatibility/Core/src/WinUI/Platform.cs b/src/Compatibility/Core/src/WinUI/Platform.cs
index 774c69f9207a..86ae6310fee2 100644
--- a/src/Compatibility/Core/src/WinUI/Platform.cs
+++ b/src/Compatibility/Core/src/WinUI/Platform.cs
@@ -11,6 +11,8 @@
 using WFlowDirection = Microsoft.UI.Xaml.FlowDirection;
 using WImage = Microsoft.UI.Xaml.Controls.Image;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Controls.Platform;
+using WVisibility = Microsoft.UI.Xaml.Visibility;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
@@ -99,7 +101,7 @@ internal static Platform Current
 		{
 			get
 			{
-				var frame = Window.Current?.Content as Microsoft.UI.Xaml.Controls.Frame;
+				var frame = UI.Xaml.Window.Current?.Content as Microsoft.UI.Xaml.Controls.Frame;
 				var wbp = frame?.Content as WindowsBasePage;
 				return wbp?.Platform;
 			}
@@ -138,7 +140,7 @@ internal Platform(Microsoft.UI.Xaml.Window page)
 			MessagingCenter.Subscribe(this, Page.BusySetSignalName, (Page sender, bool enabled) =>
 			{
 				Microsoft.UI.Xaml.Controls.ProgressBar indicator = GetBusyIndicator();
-				indicator.Visibility = enabled ? Visibility.Visible : Visibility.Collapsed;
+				indicator.Visibility = enabled ? WVisibility.Visible : WVisibility.Collapsed;
 			});
 
 			_toolbarTracker.CollectionChanged += OnToolbarItemsChanged;
@@ -146,11 +148,11 @@ internal Platform(Microsoft.UI.Xaml.Window page)
 			UpdateBounds();
 
 			InitializeStatusBar();
-						
-			// TODO WINUI
-			//SystemNavigationManager.GetForCurrentView().BackRequested += OnBackRequested;
+				
+			if(!NativeVersion.IsDesktop)
+				SystemNavigationManager.GetForCurrentView().BackRequested += OnBackRequested;
 
-			// TODO WINUI
+			// TODO WINUI: This event is only available on UWP
 			// Microsoft.UI.Xaml.Application.Current.Resuming += OnResumingAsync;
 		}
 
@@ -316,7 +318,7 @@ Microsoft.UI.Xaml.Controls.ProgressBar GetBusyIndicator()
 				_busyIndicator = new Microsoft.UI.Xaml.Controls.ProgressBar
 				{
 					IsIndeterminate = true,
-					Visibility = Visibility.Collapsed,
+					Visibility = WVisibility.Collapsed,
 					VerticalAlignment = UI.Xaml.VerticalAlignment.Top
 				};
 
@@ -555,14 +557,16 @@ internal async Task UpdateToolbarItems()
 					button.Content = img;
 				}
 
-				// WINUUI FIX
+				// TODO WINUI FIX
 				//button.Command = new MenuItemCommand(item);
 				button.DataContext = item;
 				button.SetValue(NativeAutomationProperties.AutomationIdProperty, item.AutomationId);
 				button.SetAutomationPropertiesName(item);
 				button.SetAutomationPropertiesAccessibilityView(item);
 				button.SetAutomationPropertiesHelpText(item);
-				button.SetAutomationPropertiesLabeledBy(item);
+
+				// TODO MAUI
+				button.SetAutomationPropertiesLabeledBy(item, null);
 
 				ToolbarItemOrder order = item.Order == ToolbarItemOrder.Default ? ToolbarItemOrder.Primary : item.Order;
 				if (order == ToolbarItemOrder.Primary)
diff --git a/src/Compatibility/Core/src/WinUI/PointCollectionExtensions.cs b/src/Compatibility/Core/src/WinUI/PointCollectionExtensions.cs
index c9047a6df2b2..030a654a6e10 100644
--- a/src/Compatibility/Core/src/WinUI/PointCollectionExtensions.cs
+++ b/src/Compatibility/Core/src/WinUI/PointCollectionExtensions.cs
@@ -1,7 +1,7 @@
 using Microsoft.Maui.Controls.Shapes;
 using Microsoft.Maui.Graphics;
 
-#if WINDOWS_UWP
+#if WINDOWS
 using WPoint = Windows.Foundation.Point;
 using WPointCollection = Microsoft.UI.Xaml.Media.PointCollection;
 
diff --git a/src/Compatibility/Core/src/WinUI/PointExtensions.cs b/src/Compatibility/Core/src/WinUI/PointExtensions.cs
deleted file mode 100644
index 8e35f0134131..000000000000
--- a/src/Compatibility/Core/src/WinUI/PointExtensions.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-#if WINDOWS_UWP
-using Microsoft.Maui.Graphics;
-using WPoint = Windows.Foundation.Point;
-
-namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
-#else
-using WPoint = System.Windows.Point;
-
-namespace Microsoft.Maui.Controls.Compatibility.Platform.WPF
-#endif
-{
-	public static class PointExtensions
-	{
-		public static WPoint ToWindows(this Point point)
-		{
-			return new WPoint(point.X, point.Y);
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Compatibility/Core/src/WinUI/ProgressBarRenderer.cs b/src/Compatibility/Core/src/WinUI/ProgressBarRenderer.cs
index e94c0a97c74b..5ca3368ba05a 100644
--- a/src/Compatibility/Core/src/WinUI/ProgressBarRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/ProgressBarRenderer.cs
@@ -3,6 +3,7 @@
 using Microsoft.UI.Xaml.Controls.Primitives;
 using Microsoft.Maui.Controls.Internals;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Controls.Platform;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
@@ -82,10 +83,11 @@ void UpdateProgressColor()
 			}
 			else
 			{
-				Control.Foreground = color.ToBrush();
+				Control.Foreground = Maui.ColorExtensions.ToNative(color);
 			}
 		}
 
+		[PortHandler]
 		void ProgressBarOnValueChanged(object sender, RangeBaseValueChangedEventArgs rangeBaseValueChangedEventArgs)
 		{
 			((IVisualElementController)Element)?.InvalidateMeasure(InvalidationTrigger.MeasureChanged);
diff --git a/src/Compatibility/Core/src/WinUI/Properties/AssemblyInfo.cs b/src/Compatibility/Core/src/WinUI/Properties/AssemblyInfo.cs
index 0420d1c75567..68d4d340f503 100644
--- a/src/Compatibility/Core/src/WinUI/Properties/AssemblyInfo.cs
+++ b/src/Compatibility/Core/src/WinUI/Properties/AssemblyInfo.cs
@@ -1,6 +1,8 @@
 using System.Reflection;
+using Microsoft.Maui;
 using Microsoft.Maui.Controls;
 using Microsoft.Maui.Controls.Compatibility.Platform.UWP;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Controls.Shapes;
 using Rectangle = Microsoft.Maui.Controls.Shapes.Rectangle;
 
@@ -77,9 +79,7 @@
 // WINUI3
 //[assembly: ExportRenderer(typeof(TabbedPage), typeof(TabbedPageRenderer))]
 
-//Fonts
-// WINUI3
-//[assembly: ExportRenderer(typeof(EmbeddedFont), typeof(EmbeddedFontLoader))]
+[assembly: ExportRenderer(typeof(EmbeddedFont), typeof(EmbeddedFontLoader))]
 
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Microsoft.Maui.Controls.DualScreen")]
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Microsoft.Maui.Controls.Compatibility.Platform.UAP.UnitTests")]
diff --git a/src/Compatibility/Core/src/WinUI/RadioButtonRenderer.cs b/src/Compatibility/Core/src/WinUI/RadioButtonRenderer.cs
index 6d3e2e7a3fef..9e4ffbe33722 100644
--- a/src/Compatibility/Core/src/WinUI/RadioButtonRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/RadioButtonRenderer.cs
@@ -5,6 +5,7 @@
 using WThickness = Microsoft.UI.Xaml.Thickness;
 using static Microsoft.Maui.Controls.Compatibility.Platform.UWP.ViewToRendererConverter;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Controls.Platform;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
@@ -145,14 +146,14 @@ void OnRadioButtonCheckedOrUnchecked(object sender, RoutedEventArgs e)
 		void UpdateBackgroundBrush()
 		{
 			if (Brush.IsNullOrEmpty(Element.Background))
-				Control.BackgroundColor = Element.BackgroundColor.IsNotDefault() ? Element.BackgroundColor.ToBrush() : (WBrush)Microsoft.UI.Xaml.Application.Current.Resources["ButtonBackgroundThemeBrush"];
+				Control.BackgroundColor = Element.BackgroundColor.IsNotDefault() ? Maui.ColorExtensions.ToNative(Element.BackgroundColor) : (WBrush)Microsoft.UI.Xaml.Application.Current.Resources["ButtonBackgroundThemeBrush"];
 			else
 				Control.BackgroundColor = Element.Background.ToBrush();
 		}
 
 		void UpdateBorderColor()
 		{
-			Control.BorderBrush = Element.BorderColor.IsNotDefault() ? Element.BorderColor.ToBrush() : (WBrush)Microsoft.UI.Xaml.Application.Current.Resources["ButtonBorderThemeBrush"];
+			Control.BorderBrush = Element.BorderColor.IsNotDefault() ? Maui.ColorExtensions.ToNative(Element.BorderColor) : (WBrush)Microsoft.UI.Xaml.Application.Current.Resources["ButtonBorderThemeBrush"];
 		}
 
 		void UpdateBorderRadius()
@@ -188,7 +189,7 @@ void UpdateFont()
 			if (font == Font.Default && !_fontApplied)
 				return;
 
-			Font fontToApply = font == Font.Default ? Font.SystemFontOfSize(NamedSize.Medium) : font;
+			Font fontToApply = font == Font.Default ? Font.SystemFontOfSize(Device.GetNamedSize(NamedSize.Medium, Element.GetType(), false)) : font;
 
 			Control.ApplyFont(fontToApply);
 			_fontApplied = true;
@@ -196,7 +197,7 @@ void UpdateFont()
 
 		void UpdateTextColor()
 		{
-			Control.Foreground = Element.TextColor.IsNotDefault() ? Element.TextColor.ToBrush() : (WBrush)Microsoft.UI.Xaml.Application.Current.Resources["DefaultTextForegroundThemeBrush"];
+			Control.Foreground = Element.TextColor.IsNotDefault() ? Maui.ColorExtensions.ToNative(Element.TextColor) : (WBrush)Microsoft.UI.Xaml.Application.Current.Resources["DefaultTextForegroundThemeBrush"];
 		}
 
 		void UpdatePadding()
diff --git a/src/Compatibility/Core/src/WinUI/RefreshViewRenderer.cs b/src/Compatibility/Core/src/WinUI/RefreshViewRenderer.cs
index f759d854f95a..d73e341a3655 100644
--- a/src/Compatibility/Core/src/WinUI/RefreshViewRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/RefreshViewRenderer.cs
@@ -9,6 +9,7 @@
 using Specifics = Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific.RefreshView;
 using WBrush = Microsoft.UI.Xaml.Media.Brush;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Controls.Platform;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
@@ -120,9 +121,9 @@ protected override void UpdateBackgroundColor()
 				return;
 
 			if (Element.BackgroundColor.IsNotDefault())
-				Control.Visualizer.Background = Element.BackgroundColor.ToBrush();
+				Control.Visualizer.Background = Maui.ColorExtensions.ToNative(Element.BackgroundColor);
 			else
-				Control.Visualizer.Background = Colors.White.ToBrush();
+				Control.Visualizer.Background = Maui.ColorExtensions.ToNative(Colors.White);
 		}
 
 		void UpdateContent()
@@ -160,7 +161,7 @@ void UpdateColors()
 				return;
 
 			Control.Visualizer.Foreground = Element.RefreshColor.IsNotDefault()
-				? Element.RefreshColor.ToBrush()
+				? Maui.ColorExtensions.ToNative(Element.RefreshColor)
 				: (WBrush)Microsoft.UI.Xaml.Application.Current.Resources["DefaultTextForegroundThemeBrush"];
 
 			UpdateBackgroundColor();
diff --git a/src/Compatibility/Core/src/WinUI/RendererToHandlerShim.cs b/src/Compatibility/Core/src/WinUI/RendererToHandlerShim.cs
index 9e24462c3ca1..58bcf88985d2 100644
--- a/src/Compatibility/Core/src/WinUI/RendererToHandlerShim.cs
+++ b/src/Compatibility/Core/src/WinUI/RendererToHandlerShim.cs
@@ -4,6 +4,7 @@
 using Microsoft.Maui.Controls.Compatibility.Platform.UWP;
 using Microsoft.UI.Xaml;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Controls.Platform;
 
 namespace Microsoft.Maui.Controls.Compatibility
 {
diff --git a/src/Compatibility/Core/src/WinUI/ScrollViewRenderer.cs b/src/Compatibility/Core/src/WinUI/ScrollViewRenderer.cs
index 6dae05612797..8489dce9823b 100644
--- a/src/Compatibility/Core/src/WinUI/ScrollViewRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/ScrollViewRenderer.cs
@@ -6,6 +6,7 @@
 using WRect = Windows.Foundation.Rect;
 using UwpScrollBarVisibility = Microsoft.UI.Xaml.Controls.ScrollBarVisibility;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Controls.Platform;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
diff --git a/src/Compatibility/Core/src/WinUI/SearchBarRenderer.cs b/src/Compatibility/Core/src/WinUI/SearchBarRenderer.cs
index 9c05b83dea36..903154e3a687 100644
--- a/src/Compatibility/Core/src/WinUI/SearchBarRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/SearchBarRenderer.cs
@@ -7,6 +7,7 @@
 using WBrush = Microsoft.UI.Xaml.Media.Brush;
 using Specifics = Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific.SearchBar;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Controls.Platform;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
@@ -136,6 +137,7 @@ protected override void SetAutomationId(string id)
 			_queryTextBox.SetAutomationPropertiesAutomationId($"{id}_AutoSuggestBox");
 		}
 
+		[PortHandler]
 		void OnQuerySubmitted(AutoSuggestBox sender, AutoSuggestBoxQuerySubmittedEventArgs e)
 		{
 			// Modifies the text of the control if it does not match the query.
@@ -146,6 +148,7 @@ void OnQuerySubmitted(AutoSuggestBox sender, AutoSuggestBoxQuerySubmittedEventAr
 			Element.OnSearchButtonPressed();
 		}
 
+		[PortHandler]
 		void OnTextChanged(AutoSuggestBox sender, AutoSuggestBoxTextChangedEventArgs e)
 		{
 			if (e.Reason == AutoSuggestionBoxTextChangeReason.ProgrammaticChange)
@@ -188,7 +191,7 @@ void UpdateCancelButtonColor()
 			else
 			{
 				// Determine whether the background should be black or white (in order to make the foreground color visible) 
-				var bcolor = cancelColor.ToWindowsColor().GetContrastingColor().ToFormsColor();
+				var bcolor = cancelColor.ToWindowsColor().GetContrastingColor().ToColor();
 				BrushHelpers.UpdateColor(bcolor, ref _defaultDeleteButtonBackgroundColorBrush,
 					() => _cancelButton.BackgroundBrush, brush => _cancelButton.BackgroundBrush = brush);
 			}
@@ -223,11 +226,13 @@ void UpdateFont()
 			_fontApplied = true;
 		}
 
+		[PortHandler]
 		void UpdateCharacterSpacing()
 		{
 			Control.CharacterSpacing = Element.CharacterSpacing.ToEm();
 		}
 
+		[PortHandler]
 		void UpdatePlaceholder()
 		{
 			Control.PlaceholderText = Element.Placeholder ?? string.Empty;
@@ -323,7 +328,7 @@ protected override void UpdateBackgroundColor()
 			
 			if (!backgroundColor.IsDefault())
 			{
-				_queryTextBox.Background = backgroundColor.ToBrush();
+				_queryTextBox.Background = Maui.ColorExtensions.ToNative(backgroundColor);
 			}
 			else
 			{
diff --git a/src/Compatibility/Core/src/WinUI/Shapes/EllipseRenderer.cs b/src/Compatibility/Core/src/WinUI/Shapes/EllipseRenderer.cs
index ca88dff12a98..eebef955337a 100644
--- a/src/Compatibility/Core/src/WinUI/Shapes/EllipseRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/Shapes/EllipseRenderer.cs
@@ -1,6 +1,7 @@
 using Microsoft.Maui.Controls.Shapes;
+using Microsoft.Maui.Controls.Platform;
 
-#if WINDOWS_UWP
+#if WINDOWS
 using WEllipse = Microsoft.UI.Xaml.Shapes.Ellipse;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
diff --git a/src/Compatibility/Core/src/WinUI/Shapes/LineRenderer.cs b/src/Compatibility/Core/src/WinUI/Shapes/LineRenderer.cs
index 9dfe376e930c..1aeb68b77b92 100644
--- a/src/Compatibility/Core/src/WinUI/Shapes/LineRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/Shapes/LineRenderer.cs
@@ -1,7 +1,8 @@
 using System.ComponentModel;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Controls.Shapes;
 
-#if WINDOWS_UWP
+#if WINDOWS
 using WLine = Microsoft.UI.Xaml.Shapes.Line;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
diff --git a/src/Compatibility/Core/src/WinUI/Shapes/PathRenderer.cs b/src/Compatibility/Core/src/WinUI/Shapes/PathRenderer.cs
index bebc33b16948..ea981f0e6c15 100644
--- a/src/Compatibility/Core/src/WinUI/Shapes/PathRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/Shapes/PathRenderer.cs
@@ -1,7 +1,8 @@
 using System.ComponentModel;
 using Path = Microsoft.Maui.Controls.Shapes.Path;
+using Microsoft.Maui.Controls.Platform;
 
-#if WINDOWS_UWP
+#if WINDOWS
 using WPath = Microsoft.UI.Xaml.Shapes.Path;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
@@ -41,7 +42,7 @@ protected override void OnElementPropertyChanged(object sender, PropertyChangedE
 
 		void UpdateData()
 		{
-			Control.Data = Element.Data.ToWindows();
+			Control.Data = Element.Data.ToNative();
 		}
 
 		void UpdateRenderTransform()
diff --git a/src/Compatibility/Core/src/WinUI/Shapes/PolygonRenderer.cs b/src/Compatibility/Core/src/WinUI/Shapes/PolygonRenderer.cs
index 5a2c0d47aa3c..2e296468311e 100644
--- a/src/Compatibility/Core/src/WinUI/Shapes/PolygonRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/Shapes/PolygonRenderer.cs
@@ -1,8 +1,9 @@
 using System.ComponentModel;
 using Microsoft.Maui.Controls.Shapes;
 using System.Collections.Specialized;
+using Microsoft.Maui.Controls.Platform;
 
-#if WINDOWS_UWP
+#if WINDOWS
 using WFillRule = Microsoft.UI.Xaml.Media.FillRule;
 using WPolygon = Microsoft.UI.Xaml.Shapes.Polygon;
 
diff --git a/src/Compatibility/Core/src/WinUI/Shapes/PolylineRenderer.cs b/src/Compatibility/Core/src/WinUI/Shapes/PolylineRenderer.cs
index 862909fb7ca1..8ef1f35f0bc9 100644
--- a/src/Compatibility/Core/src/WinUI/Shapes/PolylineRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/Shapes/PolylineRenderer.cs
@@ -1,8 +1,9 @@
 using System.ComponentModel;
 using Microsoft.Maui.Controls.Shapes;
 using System.Collections.Specialized;
+using Microsoft.Maui.Controls.Platform;
 
-#if WINDOWS_UWP
+#if WINDOWS
 using WFillRule = Microsoft.UI.Xaml.Media.FillRule;
 using WPolyline = Microsoft.UI.Xaml.Shapes.Polyline;
 
diff --git a/src/Compatibility/Core/src/WinUI/Shapes/RectangleRenderer.cs b/src/Compatibility/Core/src/WinUI/Shapes/RectangleRenderer.cs
index 328db4023f7c..e838de0dfa91 100644
--- a/src/Compatibility/Core/src/WinUI/Shapes/RectangleRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/Shapes/RectangleRenderer.cs
@@ -1,7 +1,8 @@
 using System.ComponentModel;
+using Microsoft.Maui.Controls.Platform;
 using FormsRectangle = Microsoft.Maui.Controls.Shapes.Rectangle;
 
-#if WINDOWS_UWP
+#if WINDOWS
 using WRectangle = Microsoft.UI.Xaml.Shapes.Rectangle;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
diff --git a/src/Compatibility/Core/src/WinUI/Shapes/ShapeRenderer.cs b/src/Compatibility/Core/src/WinUI/Shapes/ShapeRenderer.cs
index e120fc2b8f3a..9be91b9227ff 100644
--- a/src/Compatibility/Core/src/WinUI/Shapes/ShapeRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/Shapes/ShapeRenderer.cs
@@ -2,8 +2,9 @@
 using System.ComponentModel;
 using Shape = Microsoft.Maui.Controls.Shapes.Shape;
 using Microsoft.Maui.Controls.Shapes;
+using Microsoft.Maui.Controls.Platform;
 
-#if WINDOWS_UWP
+#if WINDOWS
 using Microsoft.UI.Xaml;
 using WDoubleCollection = Microsoft.UI.Xaml.Media.DoubleCollection;
 using WPenLineCap = Microsoft.UI.Xaml.Media.PenLineCap;
@@ -74,7 +75,7 @@ protected override void OnElementPropertyChanged(object sender, PropertyChangedE
 				UpdateStrokeMiterLimit();
 		}
 
-#if !WINDOWS_UWP
+#if !WINDOWS
 		new
 #endif
 		void UpdateHeight()
@@ -82,7 +83,7 @@ void UpdateHeight()
 			Control.Height = Math.Max(Element.Height, 0);
 		}
 
-#if !WINDOWS_UWP
+#if !WINDOWS
 		new
 #endif
 		void UpdateWidth()
diff --git a/src/Compatibility/Core/src/WinUI/Shell/ShellFlyoutItemRenderer.cs b/src/Compatibility/Core/src/WinUI/Shell/ShellFlyoutItemRenderer.cs
index d19a85fcbe8a..203d8df33163 100644
--- a/src/Compatibility/Core/src/WinUI/Shell/ShellFlyoutItemRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/Shell/ShellFlyoutItemRenderer.cs
@@ -9,6 +9,7 @@
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media;
 using WRect = Windows.Foundation.Rect;
+using WVisibility = Microsoft.UI.Xaml.Visibility;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
@@ -123,11 +124,11 @@ void OnMeasureInvalidated()
 			{
 				if (!_content.IsVisible)
 				{
-					fe.Visibility = Visibility.Collapsed;
+					fe.Visibility = WVisibility.Collapsed;
 				}
 				else
 				{
-					fe.Visibility = Visibility.Visible;
+					fe.Visibility = WVisibility.Visible;
 				}
 			}
 
diff --git a/src/Compatibility/Core/src/WinUI/Shell/ShellItemRenderer.cs b/src/Compatibility/Core/src/WinUI/Shell/ShellItemRenderer.cs
index ab541b8e99a6..6ba970c8014d 100644
--- a/src/Compatibility/Core/src/WinUI/Shell/ShellItemRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/Shell/ShellItemRenderer.cs
@@ -17,6 +17,8 @@
 using Microsoft.UI.Xaml.Media;
 using UwpApplication = Microsoft.UI.Xaml.Application;
 using UwpSolidColorBrush = Microsoft.UI.Xaml.Media.SolidColorBrush;
+using Microsoft.Maui.Controls.Platform;
+using WVisibility = Microsoft.UI.Xaml.Visibility;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
@@ -167,7 +169,7 @@ void UpdateBottomBar()
 
 							if (!fontImageSource.Color.IsDefault())
 							{
-								icon.Foreground = fontImageSource.Color.ToBrush();
+								icon.Foreground = Maui.ColorExtensions.ToNative(fontImageSource.Color);
 							}
 
 							btn.Icon = icon;
@@ -360,12 +362,12 @@ void UpdateNavBarVisibility()
 		{
 			if (DisplayedPage == null || Shell.GetNavBarIsVisible(DisplayedPage))
 			{
-				_HeaderArea.Visibility = Visibility.Visible;
+				_HeaderArea.Visibility = WVisibility.Visible;
 				Shell.SetFlyoutBehavior(Shell.Current, Microsoft.Maui.Controls.FlyoutBehavior.Flyout);
 			}
 			else
 			{
-				_HeaderArea.Visibility = Visibility.Collapsed;
+				_HeaderArea.Visibility = WVisibility.Collapsed;
 				Shell.SetFlyoutBehavior(Shell.Current, Microsoft.Maui.Controls.FlyoutBehavior.Disabled);
 			}
 		}
@@ -378,7 +380,7 @@ void UpdatePageTitle()
 		void UpdateBottomBarVisibility()
 		{
 			bool isVisible = ShellItemController?.ShowTabs ?? false;
-			_BottomBar.Visibility = isVisible ? Visibility.Visible : Visibility.Collapsed;
+			_BottomBar.Visibility = isVisible ? WVisibility.Visible : WVisibility.Collapsed;
 		}
 
 		void UpdateToolbar()
diff --git a/src/Compatibility/Core/src/WinUI/Shell/ShellRenderer.cs b/src/Compatibility/Core/src/WinUI/Shell/ShellRenderer.cs
index ef0340b92859..a0e1833a7d05 100644
--- a/src/Compatibility/Core/src/WinUI/Shell/ShellRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/Shell/ShellRenderer.cs
@@ -11,6 +11,7 @@
 using Microsoft.UI;
 using System.Collections.Specialized;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Controls.Platform;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
@@ -302,7 +303,7 @@ protected virtual void UpdateFlyoutBackgroundColor()
 					new WSolidColorBrush(uiColor);
 			}
 			else
-				FlyoutBackgroundColor = _shell.FlyoutBackgroundColor.ToBrush();
+				FlyoutBackgroundColor = Maui.ColorExtensions.ToNative(_shell.FlyoutBackgroundColor);
 		}
 
 		protected virtual void OnElementSet(Shell shell)
diff --git a/src/Compatibility/Core/src/WinUI/Shell/ShellSplitView.cs b/src/Compatibility/Core/src/WinUI/Shell/ShellSplitView.cs
index 84fe596dd8d5..860a754bfec1 100644
--- a/src/Compatibility/Core/src/WinUI/Shell/ShellSplitView.cs
+++ b/src/Compatibility/Core/src/WinUI/Shell/ShellSplitView.cs
@@ -2,6 +2,7 @@
 using WBrush = Microsoft.UI.Xaml.Media.Brush;
 using WRectangle = Microsoft.UI.Xaml.Shapes.Rectangle;
 using Microsoft.UI.Xaml;
+using Microsoft.Maui.Controls.Platform;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
diff --git a/src/Compatibility/Core/src/WinUI/Shell/ShellToolbarItemRenderer.cs b/src/Compatibility/Core/src/WinUI/Shell/ShellToolbarItemRenderer.cs
index 6faaa5f8213c..4258653d686e 100644
--- a/src/Compatibility/Core/src/WinUI/Shell/ShellToolbarItemRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/Shell/ShellToolbarItemRenderer.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Input;
 
@@ -44,14 +45,16 @@ void ToolbarItemChanged(ToolbarItem oldItem, ToolbarItem newItem)
 			if(oldItem != null)
 				oldItem.PropertyChanged -= ToolbarItemPropertyChanged;
 
-			this.SetAutomationProperties(newItem, defaultName: newItem?.Text);
+			// TODO MAUI
+			this.SetAutomationProperties(newItem, null, defaultName: newItem?.Text);
 
 			if (newItem != null)
 				newItem.PropertyChanged += ToolbarItemPropertyChanged;
 
 			void ToolbarItemPropertyChanged(object sender, PropertyChangedEventArgs e)
 			{
-				this.SetAutomationProperties(newItem, defaultName: newItem?.Text);
+				// TODO MAUI
+				this.SetAutomationProperties(newItem, null, defaultName: newItem?.Text);
 			}
 		}
 	}
diff --git a/src/Compatibility/Core/src/WinUI/SliderRenderer.cs b/src/Compatibility/Core/src/WinUI/SliderRenderer.cs
index 59c17d4f47ba..4c835f2b9ace 100644
--- a/src/Compatibility/Core/src/WinUI/SliderRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/SliderRenderer.cs
@@ -7,6 +7,7 @@
 using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Media.Imaging;
 using WBrush = Microsoft.UI.Xaml.Media.Brush;
+using Microsoft.Maui.Controls.Platform;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
@@ -102,6 +103,7 @@ void UpdateSliderColors()
 			UpdateMaximumTrackColor();
 		}
 
+		[PortHandler]
 		void UpdateMinimumTrackColor()
 		{
 			if (Control != null)
@@ -109,10 +111,11 @@ void UpdateMinimumTrackColor()
 				if (Element.MinimumTrackColor.IsDefault())
 					Control.Foreground = defaultforegroundcolor;
 				else
-					Control.Foreground = Element.MinimumTrackColor.ToBrush();
+					Control.Foreground = Maui.ColorExtensions.ToNative(Element.MinimumTrackColor);
 			}
 		}
 
+		[PortHandler]
 		void UpdateMaximumTrackColor()
 		{
 			if (Control != null)
@@ -120,7 +123,7 @@ void UpdateMaximumTrackColor()
 				if (Element.MaximumTrackColor.IsDefault())
 					Control.Background = defaultbackgroundcolor;
 				else
-					Control.Background = Element.MaximumTrackColor.ToBrush();
+					Control.Background = Maui.ColorExtensions.ToNative(Element.MaximumTrackColor);
 			}
 		}
 
@@ -192,7 +195,7 @@ protected override void UpdateBackgroundColor()
 				Color backgroundColor = Element.BackgroundColor;
 				if (!backgroundColor.IsDefault())
 				{
-					Control.Background = backgroundColor.ToBrush();
+					Control.Background = Maui.ColorExtensions.ToNative(backgroundColor);
 				}
 				else
 				{
@@ -225,16 +228,19 @@ void UpdateFlowDirection()
 
 		protected override bool PreventGestureBubbling { get; set; } = true;
 
+		[PortHandler]
 		void OnNativeValueChanged(object sender, RangeBaseValueChangedEventArgs e)
 		{
 			((IElementController)Element).SetValueFromRenderer(Slider.ValueProperty, e.NewValue);
 		}
 
+		[PortHandler]
 		void OnPointerPressed(object sender, PointerRoutedEventArgs e)
 		{
 			((ISliderController)Element)?.SendDragStarted();
 		}
 
+		[PortHandler]
 		void OnPointerReleased(object sender, PointerRoutedEventArgs e)
 		{
 			((ISliderController)Element)?.SendDragCompleted();
diff --git a/src/Compatibility/Core/src/WinUI/StepperControl.cs b/src/Compatibility/Core/src/WinUI/StepperControl.cs
index 5f3bff00a9fc..a1e78f6c9ee2 100644
--- a/src/Compatibility/Core/src/WinUI/StepperControl.cs
+++ b/src/Compatibility/Core/src/WinUI/StepperControl.cs
@@ -9,6 +9,7 @@
 using WVisualStateGroup = Microsoft.UI.Xaml.VisualStateGroup;
 using WVisualState = Microsoft.UI.Xaml.VisualState;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Controls.Platform;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
@@ -230,7 +231,7 @@ void UpdateButtonBackgroundColor(Color value)
 				return;
 			}
 
-			WBrush brush = value.ToBrush();
+			WBrush brush = Maui.ColorExtensions.ToNative(value);
 			_minus = GetTemplateChild("Minus") as Microsoft.UI.Xaml.Controls.Button;
 			_plus = GetTemplateChild("Plus") as Microsoft.UI.Xaml.Controls.Button;
 			if (_minus != null)
diff --git a/src/Compatibility/Core/src/WinUI/StepperRenderer.cs b/src/Compatibility/Core/src/WinUI/StepperRenderer.cs
index cc4536ad4811..83be6543164c 100644
--- a/src/Compatibility/Core/src/WinUI/StepperRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/StepperRenderer.cs
@@ -1,5 +1,6 @@
 using System;
 using System.ComponentModel;
+using Microsoft.Maui.Controls.Platform;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
diff --git a/src/Compatibility/Core/src/WinUI/StreamImagesourceHandler.cs b/src/Compatibility/Core/src/WinUI/StreamImagesourceHandler.cs
index f5bd2dc9c311..3d92a21ddfa4 100644
--- a/src/Compatibility/Core/src/WinUI/StreamImagesourceHandler.cs
+++ b/src/Compatibility/Core/src/WinUI/StreamImagesourceHandler.cs
@@ -2,6 +2,7 @@
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.UI.Xaml.Media.Imaging;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
diff --git a/src/Compatibility/Core/src/WinUI/SwipeViewRenderer.cs b/src/Compatibility/Core/src/WinUI/SwipeViewRenderer.cs
index f60fdb2bd6a3..ab836d21a30e 100644
--- a/src/Compatibility/Core/src/WinUI/SwipeViewRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/SwipeViewRenderer.cs
@@ -9,6 +9,7 @@
 using WSwipeItem = Microsoft.UI.Xaml.Controls.SwipeItem;
 using WSwipeMode = Microsoft.UI.Xaml.Controls.SwipeMode;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Controls.Platform;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
@@ -131,7 +132,7 @@ protected override void UpdateBackgroundColor()
 
 			if (Control != null)
 			{
-				Control.Background = backgroundColor.IsDefault() ? null : backgroundColor.ToBrush();
+				Control.Background = backgroundColor.IsDefault() ? null : Maui.ColorExtensions.ToNative(backgroundColor);
 			}
 
 			base.UpdateBackgroundColor();
@@ -256,10 +257,10 @@ void UpdateSwipeItem(SwipeItem formsSwipeItem)
 			{
 				windowsSwipeItem.Text = formsSwipeItem.Text;
 				windowsSwipeItem.IconSource = formsSwipeItem.IconImageSource.ToWindowsIconSource();
-				windowsSwipeItem.Background = formsSwipeItem.BackgroundColor.ToBrush();
+				windowsSwipeItem.Background = Maui.ColorExtensions.ToNative(formsSwipeItem.BackgroundColor);
 
 				var textColor = GetSwipeItemColor(formsSwipeItem.BackgroundColor);
-				windowsSwipeItem.Foreground = textColor.ToBrush();
+				windowsSwipeItem.Foreground = Maui.ColorExtensions.ToNative(textColor);
 			}
 		}
 
@@ -326,8 +327,8 @@ WSwipeItems CreateSwipeItems(SwipeDirection swipeDirection)
 
 					var windowsSwipeItem = new WSwipeItem
 					{
-						Background = formsSwipeItem.BackgroundColor.IsDefault() ? null : formsSwipeItem.BackgroundColor.ToBrush(),
-						Foreground = textColor.ToBrush(),
+						Background = formsSwipeItem.BackgroundColor.IsDefault() ? null : Maui.ColorExtensions.ToNative(formsSwipeItem.BackgroundColor),
+						Foreground = Maui.ColorExtensions.ToNative(textColor),
 						IconSource = formsSwipeItem.IconImageSource.ToWindowsIconSource(),
 						Text = !string.IsNullOrEmpty(formsSwipeItem.Text) ? formsSwipeItem.Text : string.Empty,
 						BehaviorOnInvoked = GetSwipeBehaviorOnInvoked(items.SwipeBehaviorOnInvoked)
diff --git a/src/Compatibility/Core/src/WinUI/SwitchRenderer.cs b/src/Compatibility/Core/src/WinUI/SwitchRenderer.cs
index 4b9e70ffd3b2..7384c740d52e 100644
--- a/src/Compatibility/Core/src/WinUI/SwitchRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/SwitchRenderer.cs
@@ -11,6 +11,7 @@
 using WRectangle = Microsoft.UI.Xaml.Shapes.Rectangle;
 using WSolidColorBrush = Microsoft.UI.Xaml.Media.SolidColorBrush;
 using WVisualStateManager = Microsoft.UI.Xaml.VisualStateManager;
+using Microsoft.Maui.Controls.Platform;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
@@ -199,7 +200,7 @@ void UpdateThumbColor()
 
 								if (!Element.ThumbColor.IsDefault())
 								{
-									var brush = Element.ThumbColor.ToBrush();
+									var brush = Maui.ColorExtensions.ToNative(Element.ThumbColor);
 									brush.Opacity = _originalThumbOnBrush.Opacity;
 									frame.Value = brush;
 								}
@@ -218,7 +219,7 @@ void UpdateThumbColor()
 					_originalThumbOnBrush = thumb.Fill;
 
 				if (!Element.ThumbColor.IsDefault())
-					thumb.Fill = Element.ThumbColor.ToBrush();
+					thumb.Fill = Maui.ColorExtensions.ToNative(Element.ThumbColor);
 				else
 					thumb.Fill = _originalThumbOnBrush;
 			}
diff --git a/src/Compatibility/Core/src/WinUI/TableViewRenderer.cs b/src/Compatibility/Core/src/WinUI/TableViewRenderer.cs
index 7cc8d7fe2e7b..67c5f1a82ada 100644
--- a/src/Compatibility/Core/src/WinUI/TableViewRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/TableViewRenderer.cs
@@ -4,6 +4,7 @@
 using Microsoft.UI.Xaml.Data;
 using WItemsControl = Microsoft.UI.Xaml.Controls.ItemsControl;
 using WSelectionChangedEventArgs = Microsoft.UI.Xaml.Controls.SelectionChangedEventArgs;
+using Microsoft.Maui.Controls.Platform;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
diff --git a/src/Compatibility/Core/src/WinUI/TextBlockExtensions.cs b/src/Compatibility/Core/src/WinUI/TextBlockExtensions.cs
index 557818e9bf97..27f0bd0530f2 100644
--- a/src/Compatibility/Core/src/WinUI/TextBlockExtensions.cs
+++ b/src/Compatibility/Core/src/WinUI/TextBlockExtensions.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using Microsoft.Maui.Controls.Internals;
 using Microsoft.Maui.Graphics;
-#if WINDOWS_UWP
+#if WINDOWS
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Documents;
 using NativeSize = Windows.Foundation.Size;
@@ -12,7 +12,7 @@
 using NativeSize = System.Windows.Size;
 #endif
 
-#if WINDOWS_UWP
+#if WINDOWS
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 #else
 namespace Microsoft.Maui.Controls.Compatibility.Platform.WPF
diff --git a/src/Compatibility/Core/src/WinUI/TimePickerRenderer.cs b/src/Compatibility/Core/src/WinUI/TimePickerRenderer.cs
index ad09733763d5..d8f1fcd14ea5 100644
--- a/src/Compatibility/Core/src/WinUI/TimePickerRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/TimePickerRenderer.cs
@@ -8,6 +8,7 @@
 using Microsoft.UI.Xaml.Controls.Primitives;
 using WBrush = Microsoft.UI.Xaml.Media.Brush;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Controls.Platform;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
@@ -162,6 +163,7 @@ void UpdateFont()
 			_fontApplied = true;
 		}
 
+		[PortHandler]
 		void UpdateTime()
 		{
 			Control.Time = Element.Time;
@@ -183,7 +185,7 @@ void UpdateCharacterSpacing()
 		void UpdateTextColor()
 		{
 			Color color = Element.TextColor;
-			Control.Foreground = color.IsDefault() ? (_defaultBrush ?? color.ToBrush()) : color.ToBrush();
+			Control.Foreground = color.IsDefault() ? (_defaultBrush ?? Maui.ColorExtensions.ToNative(color)) : Maui.ColorExtensions.ToNative(color);
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Compatibility/Core/src/WinUI/TitleViewManager.cs b/src/Compatibility/Core/src/WinUI/TitleViewManager.cs
index 2b435bd3567a..499ea053e49c 100644
--- a/src/Compatibility/Core/src/WinUI/TitleViewManager.cs
+++ b/src/Compatibility/Core/src/WinUI/TitleViewManager.cs
@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using WVisibility = Microsoft.UI.Xaml.Visibility;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
@@ -70,7 +71,7 @@ void UpdateTitleViewWidth()
 
 			double buttonWidth = 0;
 			foreach (var item in CommandBar.GetDescendantsByName<Microsoft.UI.Xaml.Controls.Button>("MoreButton"))
-				if (item.Visibility == Visibility.Visible)
+				if (item.Visibility == WVisibility.Visible)
 					buttonWidth += item.ActualWidth;
 
 			if (!CommandBar.IsDynamicOverflowEnabled)
diff --git a/src/Compatibility/Core/src/WinUI/UriImageSourceHandler.cs b/src/Compatibility/Core/src/WinUI/UriImageSourceHandler.cs
index 3c79a5d69f6e..4aefdc1699a7 100644
--- a/src/Compatibility/Core/src/WinUI/UriImageSourceHandler.cs
+++ b/src/Compatibility/Core/src/WinUI/UriImageSourceHandler.cs
@@ -6,6 +6,7 @@
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media.Imaging;
 using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Controls.Platform;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
@@ -42,7 +43,7 @@ public Task<IconElement> LoadIconElementAsync(ImageSource imagesource, Cancellat
 			if (imageLoader?.Uri == null)
 				return null;
 
-			Stream streamImage = await imageLoader.GetStreamAsync(cancellationToken);
+			Stream streamImage = await ((IStreamImageSource)imageLoader).GetStreamAsync(cancellationToken);
 
 			if (streamImage == null || !streamImage.CanRead)
 			{
diff --git a/src/Compatibility/Core/src/WinUI/ViewRenderer.cs b/src/Compatibility/Core/src/WinUI/ViewRenderer.cs
index 7ee9e0934335..b6d0570ca664 100644
--- a/src/Compatibility/Core/src/WinUI/ViewRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/ViewRenderer.cs
@@ -1,5 +1,6 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Automation.Peers;
+using Microsoft.Maui.Controls.Platform;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
diff --git a/src/Compatibility/Core/src/WinUI/VisualElementRenderer.cs b/src/Compatibility/Core/src/WinUI/VisualElementRenderer.cs
index eef5b8576ece..8139e4be3e6d 100644
--- a/src/Compatibility/Core/src/WinUI/VisualElementRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/VisualElementRenderer.cs
@@ -11,6 +11,7 @@
 using WRect = Windows.Foundation.Rect;
 using WSolidColorBrush = Microsoft.UI.Xaml.Media.SolidColorBrush;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Controls.Platform;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
@@ -434,7 +435,8 @@ protected virtual void SetAutomationPropertiesLabeledBy()
 			if (Control == null)
 				return;
 
-			_defaultAutomationPropertiesLabeledBy = Control.SetAutomationPropertiesLabeledBy(Element, _defaultAutomationPropertiesLabeledBy);
+			// TODO MAUI
+			_defaultAutomationPropertiesLabeledBy = Control.SetAutomationPropertiesLabeledBy(Element, null, _defaultAutomationPropertiesLabeledBy);
 		}
 
 		protected void SetNativeControl(TNativeElement control)
@@ -499,7 +501,7 @@ protected virtual void UpdateBackgroundColor()
 			{
 				if (!backgroundColor.IsDefault())
 				{
-					_control.Background = backgroundColor.ToBrush();
+					_control.Background = Maui.ColorExtensions.ToNative(backgroundColor);
 				}
 				else
 				{
@@ -511,7 +513,7 @@ protected virtual void UpdateBackgroundColor()
 			{
 				if (!backgroundColor.IsDefault())
 				{
-					backgroundLayer.Background = backgroundColor.ToBrush();
+					backgroundLayer.Background = Maui.ColorExtensions.ToNative(backgroundColor);
 				}
 				else
 				{
@@ -539,7 +541,7 @@ protected virtual void UpdateBackground()
 				else
 				{
 					if (!backgroundColor.IsDefault())
-						_control.Background = backgroundColor.ToBrush();
+						_control.Background = Maui.ColorExtensions.ToNative(backgroundColor);
 					else
 					{
 						_control.ClearValue(Microsoft.UI.Xaml.Controls.Control.BackgroundProperty);
@@ -554,7 +556,7 @@ protected virtual void UpdateBackground()
 				else
 				{
 					if (!backgroundColor.IsDefault())
-						backgroundLayer.Background = backgroundColor.ToBrush();
+						backgroundLayer.Background = Maui.ColorExtensions.ToNative(backgroundColor);
 					else
 						backgroundLayer.ClearValue(BackgroundProperty);
 				}
diff --git a/src/Compatibility/Core/src/WinUI/VisualElementTracker.cs b/src/Compatibility/Core/src/WinUI/VisualElementTracker.cs
index 636124dbbc55..f6c98ec40202 100644
--- a/src/Compatibility/Core/src/WinUI/VisualElementTracker.cs
+++ b/src/Compatibility/Core/src/WinUI/VisualElementTracker.cs
@@ -18,6 +18,7 @@
 using WCompositeTransform = Microsoft.UI.Xaml.Media.CompositeTransform;
 using WScaleTransform = Microsoft.UI.Xaml.Media.ScaleTransform;
 using Microsoft.Maui.Graphics;
+using WVisibility = Microsoft.UI.Xaml.Visibility;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
@@ -202,7 +203,7 @@ void HandleDragStarting(UIElement sender, Microsoft.UI.Xaml.DragStartingEventArg
 				}
 
 				var renderer = sender as IVisualElementRenderer;
-				var args = rec.SendDragStarting(renderer?.Element);
+				var args = rec.SendDragStarting(renderer?.Element as IView);
 				e.Data.Properties["_XFPropertes_DONTUSE"] = args.Data;
 
 				if (!args.Handled && renderer != null)
@@ -778,9 +779,10 @@ static void UpdateScaleAndRotation(VisualElement view, FrameworkElement framewor
 			UpdateRotation(view, frameworkElement);
 		}
 
+		[PortHandler]
 		static void UpdateVisibility(VisualElement view, FrameworkElement frameworkElement)
 		{
-			frameworkElement.Visibility = view.IsVisible ? Visibility.Visible : Visibility.Collapsed;
+			frameworkElement.Visibility = view.IsVisible ? WVisibility.Visible : WVisibility.Collapsed;
 		}
 
 		void UpdateDragAndDropGestureRecognizers()
diff --git a/src/Compatibility/Core/src/WinUI/WebViewRenderer.cs b/src/Compatibility/Core/src/WinUI/WebViewRenderer.cs
index 0d06deda3d45..1a743cf314f4 100644
--- a/src/Compatibility/Core/src/WinUI/WebViewRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/WebViewRenderer.cs
@@ -12,9 +12,7 @@
 using System.Linq;
 using Microsoft.UI.Xaml.Controls;
 using WWebView = Microsoft.UI.Xaml.Controls.WebView2;
-
-//TODO WINUI3
-//using WWebViewExecutionMode = Microsoft.UI.Xaml.Controls.WebViewExecutionMode;
+using Microsoft.Maui.Controls.Platform;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
diff --git a/src/Compatibility/Core/src/WinUI/Extensions/WinUIHelpers.cs b/src/Compatibility/Core/src/WinUI/WinUIHelpers.cs
similarity index 91%
rename from src/Compatibility/Core/src/WinUI/Extensions/WinUIHelpers.cs
rename to src/Compatibility/Core/src/WinUI/WinUIHelpers.cs
index d63feb5fe6d1..0b7942dc87de 100644
--- a/src/Compatibility/Core/src/WinUI/Extensions/WinUIHelpers.cs
+++ b/src/Compatibility/Core/src/WinUI/WinUIHelpers.cs
@@ -10,7 +10,7 @@
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
-	public static class WinUIHelpers
+	static class WinUIHelpers
 	{
 		public static WThickness CreateThickness(double left, double top, double right, double bottom)
 		{
@@ -55,7 +55,7 @@ public static WCornerRadius CreateCornerRadius(double all)
 			};
 		}
 
-		internal static WGridLength CreateGridLength(int v, UwpGridUnitType auto)
+		public static WGridLength CreateGridLength(int v, UwpGridUnitType auto)
 		{
 			return new WGridLength(v, auto);
 		}
diff --git a/src/Compatibility/Core/src/WinUI/WindowsBasePlatformServices.cs b/src/Compatibility/Core/src/WinUI/WindowsBasePlatformServices.cs
index 2974223ccacd..caeb71fa10fd 100644
--- a/src/Compatibility/Core/src/WinUI/WindowsBasePlatformServices.cs
+++ b/src/Compatibility/Core/src/WinUI/WindowsBasePlatformServices.cs
@@ -141,7 +141,7 @@ public Color GetNamedColor(string name)
 			if (!Microsoft.UI.Xaml.Application.Current?.Resources.ContainsKey(name) ?? true)
 				return KnownColor.Default;
 
-			return ((Windows.UI.Color)Microsoft.UI.Xaml.Application.Current?.Resources[name]).ToFormsColor();
+			return ((Windows.UI.Color)Microsoft.UI.Xaml.Application.Current?.Resources[name]).ToColor();
 		}
 
 		public async Task<Stream> GetStreamAsync(Uri uri, CancellationToken cancellationToken)
diff --git a/src/Compatibility/Core/src/WinUI/WindowsResourcesProvider.cs b/src/Compatibility/Core/src/WinUI/WindowsResourcesProvider.cs
index ffdc0b22bbdd..e19c24936fd5 100644
--- a/src/Compatibility/Core/src/WinUI/WindowsResourcesProvider.cs
+++ b/src/Compatibility/Core/src/WinUI/WindowsResourcesProvider.cs
@@ -4,6 +4,7 @@
 using Microsoft.Maui.Controls.Internals;
 using WStyle = Microsoft.UI.Xaml.Style;
 using Microsoft.UI.Text;
+using FWeight = Windows.UI.Text.FontWeight;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
 {
@@ -40,7 +41,7 @@ Style GetStyle(object nativeKey, TextBlock prototype)
 			return formsStyle;
 		}
 
-		static FontAttributes ToAttributes(FontWeight fontWeight)
+		static FontAttributes ToAttributes(FWeight fontWeight)
 		{
 			if (fontWeight.Weight == FontWeights.Bold.Weight || fontWeight.Weight == FontWeights.SemiBold.Weight 
 				|| fontWeight.Weight == FontWeights.ExtraBold.Weight)
diff --git a/src/Compatibility/Core/src/iOS/CADisplayLinkTicker.cs b/src/Compatibility/Core/src/iOS/CADisplayLinkTicker.cs
index 0af2006c6f73..a716cdaeff29 100644
--- a/src/Compatibility/Core/src/iOS/CADisplayLinkTicker.cs
+++ b/src/Compatibility/Core/src/iOS/CADisplayLinkTicker.cs
@@ -3,9 +3,8 @@
 using System.Threading;
 using CoreAnimation;
 using Foundation;
-using UIKit;
-using Microsoft.Maui.Controls.Compatibility.Internals;
 using Microsoft.Maui.Controls.Internals;
+using UIKit;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {
diff --git a/src/Compatibility/Core/src/iOS/Cells/CellRenderer.cs b/src/Compatibility/Core/src/iOS/Cells/CellRenderer.cs
index 11485303fa3a..2a56466b9cf0 100644
--- a/src/Compatibility/Core/src/iOS/Cells/CellRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Cells/CellRenderer.cs
@@ -1,9 +1,8 @@
 using System;
 using System.ComponentModel;
-using UIKit;
-using Microsoft.Maui.Controls.Compatibility.Internals;
 using Microsoft.Maui.Controls.Internals;
 using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
+using UIKit;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {
@@ -34,26 +33,26 @@ public virtual UITableViewCell GetCell(Cell item, UITableViewCell reusableCell,
 
 			UpdateBackground(tvc, item);
 
-			SetAccessibility (tvc, item);
+			SetAccessibility(tvc, item);
 
 			Performance.Stop(reference);
 			return tvc;
 		}
 
-		public virtual void SetAccessibility (UITableViewCell tableViewCell, Cell cell)
+		public virtual void SetAccessibility(UITableViewCell tableViewCell, Cell cell)
 		{
-			if (cell.IsSet (AutomationProperties.IsInAccessibleTreeProperty))
-				tableViewCell.IsAccessibilityElement = cell.GetValue (AutomationProperties.IsInAccessibleTreeProperty).Equals (true);
+			if (cell.IsSet(AutomationProperties.IsInAccessibleTreeProperty))
+				tableViewCell.IsAccessibilityElement = cell.GetValue(AutomationProperties.IsInAccessibleTreeProperty).Equals(true);
 			else
 				tableViewCell.IsAccessibilityElement = false;
 
-			if (cell.IsSet (AutomationProperties.NameProperty))
-				tableViewCell.AccessibilityLabel = cell.GetValue (AutomationProperties.NameProperty).ToString ();
+			if (cell.IsSet(AutomationProperties.NameProperty))
+				tableViewCell.AccessibilityLabel = cell.GetValue(AutomationProperties.NameProperty).ToString();
 			else
 				tableViewCell.AccessibilityLabel = null;
 
-			if (cell.IsSet (AutomationProperties.HelpTextProperty))
-				tableViewCell.AccessibilityHint = cell.GetValue (AutomationProperties.HelpTextProperty).ToString ();
+			if (cell.IsSet(AutomationProperties.HelpTextProperty))
+				tableViewCell.AccessibilityHint = cell.GetValue(AutomationProperties.HelpTextProperty).ToString();
 			else
 				tableViewCell.AccessibilityHint = null;
 		}
@@ -114,9 +113,9 @@ protected void WireUpForceUpdateSizeRequested(ICellController cell, UITableViewC
 
 			_onPropertyChangedEventHandler = (sender, e) =>
 			{
-				if(e.PropertyName == "RealCell" && sender is BindableObject bo && GetRealCell(bo) == null)
+				if (e.PropertyName == "RealCell" && sender is BindableObject bo && GetRealCell(bo) == null)
 				{
-					if(sender is ICellController icc)
+					if (sender is ICellController icc)
 						icc.ForceUpdateSizeRequested -= _onForceUpdateSizeRequested;
 
 					if (sender is INotifyPropertyChanged notifyPropertyChanged)
diff --git a/src/Compatibility/Core/src/iOS/Cells/EntryCellRenderer.cs b/src/Compatibility/Core/src/iOS/Cells/EntryCellRenderer.cs
index 5283db12c863..e98f646d23cf 100644
--- a/src/Compatibility/Core/src/iOS/Cells/EntryCellRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Cells/EntryCellRenderer.cs
@@ -164,33 +164,33 @@ public override void LayoutSubviews()
 
 			static bool OnShouldReturn(UITextField view)
 			{
-                var realCell = GetRealCell<EntryCellTableViewCell>(view);
-                var handler = realCell?.KeyboardDoneButtonPressed;
-                if (handler != null)
-                    handler(realCell, EventArgs.Empty);
+				var realCell = GetRealCell<EntryCellTableViewCell>(view);
+				var handler = realCell?.KeyboardDoneButtonPressed;
+				if (handler != null)
+					handler(realCell, EventArgs.Empty);
 
-                view.ResignFirstResponder();
+				view.ResignFirstResponder();
 				return true;
 			}
 
-            static void TextFieldOnEditingChanged(object sender, EventArgs eventArgs)
+			static void TextFieldOnEditingChanged(object sender, EventArgs eventArgs)
 			{
-                var realCell = GetRealCell<EntryCellTableViewCell>(sender as UIView);
-                var handler = realCell?.TextFieldTextChanged;
-                if (handler != null)
-                    handler(realCell, EventArgs.Empty);
-            }
-
-            static T GetRealCell<T>(UIView view) where T : UIView
-            {
-                T realCell = null;
-                while (view.Superview != null && realCell == null)
-                {
-                    view = view.Superview;
-                    realCell = view as T;
-                }
-                return realCell;
-            }
+				var realCell = GetRealCell<EntryCellTableViewCell>(sender as UIView);
+				var handler = realCell?.TextFieldTextChanged;
+				if (handler != null)
+					handler(realCell, EventArgs.Empty);
+			}
+
+			static T GetRealCell<T>(UIView view) where T : UIView
+			{
+				T realCell = null;
+				while (view.Superview != null && realCell == null)
+				{
+					view = view.Superview;
+					realCell = view as T;
+				}
+				return realCell;
+			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Compatibility/Core/src/iOS/Cells/ViewCellRenderer.cs b/src/Compatibility/Core/src/iOS/Cells/ViewCellRenderer.cs
index f4ab79e41c2c..586242573961 100644
--- a/src/Compatibility/Core/src/iOS/Cells/ViewCellRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Cells/ViewCellRenderer.cs
@@ -1,10 +1,9 @@
 using System;
 using System.ComponentModel;
+using Microsoft.Maui.Controls.Internals;
 using UIKit;
-using Microsoft.Maui.Controls.Compatibility.Internals;
 using RectangleF = CoreGraphics.CGRect;
 using SizeF = CoreGraphics.CGSize;
-using Microsoft.Maui.Controls.Internals;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {
@@ -219,7 +218,7 @@ void OnMeasureInvalidated(object sender, EventArgs e)
 				SetNeedsLayout();
 			}
 
-			
+
 		}
 	}
 }
diff --git a/src/Compatibility/Core/src/iOS/CollectionView/CarouselTemplatedCell.cs b/src/Compatibility/Core/src/iOS/CollectionView/CarouselTemplatedCell.cs
index 57b26716d127..e5794d19aba3 100644
--- a/src/Compatibility/Core/src/iOS/CollectionView/CarouselTemplatedCell.cs
+++ b/src/Compatibility/Core/src/iOS/CollectionView/CarouselTemplatedCell.cs
@@ -14,13 +14,13 @@ public class CarouselTemplatedCell : TemplatedCell
 		[Export("initWithFrame:")]
 		[Microsoft.Maui.Controls.Internals.Preserve(Conditional = true)]
 		protected CarouselTemplatedCell(CGRect frame) : base(frame)
-		{ 
+		{
 		}
 
 		public override void ConstrainTo(nfloat constant)
 		{
 		}
-		
+
 		public override void ConstrainTo(CGSize constraint)
 		{
 			ClearConstraints();
diff --git a/src/Compatibility/Core/src/iOS/CollectionView/CarouselViewController.cs b/src/Compatibility/Core/src/iOS/CollectionView/CarouselViewController.cs
index 2a5428004397..5262fbdacdbb 100644
--- a/src/Compatibility/Core/src/iOS/CollectionView/CarouselViewController.cs
+++ b/src/Compatibility/Core/src/iOS/CollectionView/CarouselViewController.cs
@@ -95,29 +95,19 @@ public override void ViewDidLayoutSubviews()
 			}
 		}
 
-		void BoundsSizeChanged() 
+		void BoundsSizeChanged()
 		{
 			//if the size changed center the item	
 			Carousel.ScrollTo(Carousel.Position, position: Microsoft.Maui.Controls.ScrollToPosition.Center, animate: false);
 		}
 
-#if MACCATALYST
-		[Foundation.Export("scrollViewWillBeginDragging:")]
-		public virtual void DraggingStarted(UIScrollView scrollView)
-#else
 		public override void DraggingStarted(UIScrollView scrollView)
-#endif
 		{
 			_isDragging = true;
 			Carousel.SetIsDragging(true);
 		}
 
-#if MACCATALYST
-		[Foundation.Export("scrollViewDidEndDragging:willDecelerate:")]
-		public virtual void DraggingEnded(UIScrollView scrollView, bool willDecelerate)
-#else
 		public override void DraggingEnded(UIScrollView scrollView, bool willDecelerate)
-#endif
 		{
 			Carousel.SetIsDragging(false);
 			_isDragging = false;
@@ -325,7 +315,7 @@ void UpdateLoop()
 		}
 
 		void ScrollToPosition(int goToPosition, int carouselPosition, bool animate, bool forceScroll = false)
-		{	
+		{
 			if (Carousel.Loop)
 				carouselPosition = _carouselViewLoopManager?.GetCorrectPositionForCenterItem(CollectionView) ?? -1;
 
@@ -626,7 +616,7 @@ void CenterHorizontalIfNeeded(UICollectionView collectionView)
 			var currentOffset = collectionView.ContentOffset;
 			var contentWidth = GetTotalContentWidth();
 			var boundsWidth = collectionView.Bounds.Size.Width;
-			
+
 			if (contentWidth == 0 || cellWidth == 0)
 				return;
 
diff --git a/src/Compatibility/Core/src/iOS/CollectionView/EmptySource.cs b/src/Compatibility/Core/src/iOS/CollectionView/EmptySource.cs
index 61e087c4c254..9ac190984367 100644
--- a/src/Compatibility/Core/src/iOS/CollectionView/EmptySource.cs
+++ b/src/Compatibility/Core/src/iOS/CollectionView/EmptySource.cs
@@ -9,7 +9,7 @@ internal class EmptySource : ILoopItemsViewSource
 
 		public int ItemCount => 0;
 
-		public bool Loop { get ; set; }
+		public bool Loop { get; set; }
 
 		public int LoopCount => 0;
 
diff --git a/src/Compatibility/Core/src/iOS/CollectionView/GridViewLayout.cs b/src/Compatibility/Core/src/iOS/CollectionView/GridViewLayout.cs
index 671431cf9755..8599e6a58462 100644
--- a/src/Compatibility/Core/src/iOS/CollectionView/GridViewLayout.cs
+++ b/src/Compatibility/Core/src/iOS/CollectionView/GridViewLayout.cs
@@ -17,12 +17,12 @@ public GridViewLayout(GridItemsLayout itemsLayout, ItemSizingStrategy itemSizing
 
 		protected override void HandlePropertyChanged(PropertyChangedEventArgs propertyChanged)
 		{
-			if(propertyChanged.IsOneOf(GridItemsLayout.SpanProperty, GridItemsLayout.HorizontalItemSpacingProperty, 
+			if (propertyChanged.IsOneOf(GridItemsLayout.SpanProperty, GridItemsLayout.HorizontalItemSpacingProperty,
 				GridItemsLayout.VerticalItemSpacingProperty))
 			{
 				// Update the constraints; ConstrainTo will pick up the new span
 				ConstrainTo(CollectionView.Frame.Size);
-				
+
 				// And force the UICollectionView to reload everything with the new span
 				CollectionView.ReloadData();
 			}
@@ -195,7 +195,7 @@ public override nfloat GetMinimumInteritemSpacingForSection(UICollectionView col
 			return ReduceSpacingToFitIfNeeded(availableSpace, requestedSpacing, _itemsLayout.Span);
 		}
 
-		void CenterAlignCellsInColumn(UICollectionViewLayoutAttributes preferredAttributes) 
+		void CenterAlignCellsInColumn(UICollectionViewLayoutAttributes preferredAttributes)
 		{
 			// Determine the set of cells above this one
 			var index = preferredAttributes.IndexPath;
@@ -229,7 +229,7 @@ void CenterAlignCellsInColumn(UICollectionViewLayoutAttributes preferredAttribut
 			}
 		}
 
-		bool NeedsSingleItemHorizontalAlignmentAdjustment(UICollectionViewLayoutAttributes[] layoutAttributesForRectElements) 
+		bool NeedsSingleItemHorizontalAlignmentAdjustment(UICollectionViewLayoutAttributes[] layoutAttributesForRectElements)
 		{
 			if (ScrollDirection == UICollectionViewScrollDirection.Horizontal)
 			{
@@ -254,7 +254,7 @@ bool NeedsPartialColumnAdjustment(int section = 0)
 			if (ScrollDirection == UICollectionViewScrollDirection.Vertical)
 			{
 				// The bug only occurs with Horizontal scrolling
-				return false; 
+				return false;
 			}
 
 			if (CollectionView.NumberOfSections() == 0)
@@ -289,7 +289,7 @@ bool NeedsPartialColumnAdjustment(int section = 0)
 			return true;
 		}
 
-		static nfloat ReduceSpacingToFitIfNeeded(nfloat available, nfloat requestedSpacing, int span) 
+		static nfloat ReduceSpacingToFitIfNeeded(nfloat available, nfloat requestedSpacing, int span)
 		{
 			if (span == 1)
 			{
diff --git a/src/Compatibility/Core/src/iOS/CollectionView/GroupableItemsViewController.cs b/src/Compatibility/Core/src/iOS/CollectionView/GroupableItemsViewController.cs
index 4114797e24a0..2b4d1a6edf30 100644
--- a/src/Compatibility/Core/src/iOS/CollectionView/GroupableItemsViewController.cs
+++ b/src/Compatibility/Core/src/iOS/CollectionView/GroupableItemsViewController.cs
@@ -20,7 +20,7 @@ public class GroupableItemsViewController<TItemsView> : SelectableItemsViewContr
 
 		Action _scrollAnimationEndedCallback;
 
-		public GroupableItemsViewController(TItemsView groupableItemsView, ItemsViewLayout layout) 
+		public GroupableItemsViewController(TItemsView groupableItemsView, ItemsViewLayout layout)
 			: base(groupableItemsView, layout)
 		{
 			_isGrouped = ItemsView.IsGrouped;
@@ -34,7 +34,7 @@ protected override UICollectionViewDelegateFlowLayout CreateDelegator()
 		protected override IItemsViewSource CreateItemsViewSource()
 		{
 			// Use the BindableProperty here (instead of _isGroupingEnabled) because the cached value might not be set yet
-			if (ItemsView.IsGrouped) 
+			if (ItemsView.IsGrouped)
 			{
 				return ItemsSourceFactory.CreateGrouped(ItemsView.ItemsSource, this);
 			}
@@ -116,8 +116,8 @@ void UpdateTemplatedSupplementaryView(TemplatedCell cell, NSString elementKind,
 
 		string DetermineViewReuseId(NSString elementKind)
 		{
-			return DetermineViewReuseId(elementKind == UICollectionElementKindSectionKey.Header 
-				? ItemsView.GroupHeaderTemplate 
+			return DetermineViewReuseId(elementKind == UICollectionElementKindSectionKey.Header
+				? ItemsView.GroupHeaderTemplate
 				: ItemsView.GroupFooterTemplate);
 		}
 
diff --git a/src/Compatibility/Core/src/iOS/CollectionView/GroupableItemsViewDelegator.cs b/src/Compatibility/Core/src/iOS/CollectionView/GroupableItemsViewDelegator.cs
index dee8f7e604c2..2cf24fe86e1e 100644
--- a/src/Compatibility/Core/src/iOS/CollectionView/GroupableItemsViewDelegator.cs
+++ b/src/Compatibility/Core/src/iOS/CollectionView/GroupableItemsViewDelegator.cs
@@ -8,7 +8,7 @@ public class GroupableItemsViewDelegator<TItemsView, TViewController> : Selectab
 		where TItemsView : GroupableItemsView
 		where TViewController : GroupableItemsViewController<TItemsView>
 	{
-		public GroupableItemsViewDelegator(ItemsViewLayout itemsViewLayout, TViewController itemsViewController) 
+		public GroupableItemsViewDelegator(ItemsViewLayout itemsViewLayout, TViewController itemsViewController)
 			: base(itemsViewLayout, itemsViewController)
 		{
 		}
diff --git a/src/Compatibility/Core/src/iOS/CollectionView/HeightConstrainedTemplatedCell.cs b/src/Compatibility/Core/src/iOS/CollectionView/HeightConstrainedTemplatedCell.cs
index 6300c3fd48e0..73eab6ca0c5b 100644
--- a/src/Compatibility/Core/src/iOS/CollectionView/HeightConstrainedTemplatedCell.cs
+++ b/src/Compatibility/Core/src/iOS/CollectionView/HeightConstrainedTemplatedCell.cs
@@ -34,7 +34,7 @@ protected override (bool, Size) NeedsContentSizeUpdate(Size currentSize)
 				return (false, size);
 			}
 
-			var desiredBounds = VisualElementRenderer.Element.Measure(double.PositiveInfinity, bounds.Height, 
+			var desiredBounds = VisualElementRenderer.Element.Measure(double.PositiveInfinity, bounds.Height,
 				MeasureFlags.IncludeMargins);
 
 			if (desiredBounds.Request.Width == currentSize.Width)
diff --git a/src/Compatibility/Core/src/iOS/CollectionView/ILoopItemsViewSource.cs b/src/Compatibility/Core/src/iOS/CollectionView/ILoopItemsViewSource.cs
index 06c09fa763e3..fd0a03893818 100644
--- a/src/Compatibility/Core/src/iOS/CollectionView/ILoopItemsViewSource.cs
+++ b/src/Compatibility/Core/src/iOS/CollectionView/ILoopItemsViewSource.cs
@@ -1,9 +1,9 @@
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {
-    public interface ILoopItemsViewSource : IItemsViewSource
-    {
-        bool Loop { get; set; }
+	public interface ILoopItemsViewSource : IItemsViewSource
+	{
+		bool Loop { get; set; }
 
-        int LoopCount { get; }
-    }
+		int LoopCount { get; }
+	}
 }
\ No newline at end of file
diff --git a/src/Compatibility/Core/src/iOS/CollectionView/IndexPathHelpers.cs b/src/Compatibility/Core/src/iOS/CollectionView/IndexPathHelpers.cs
index 9578e4520bf1..a57b78823564 100644
--- a/src/Compatibility/Core/src/iOS/CollectionView/IndexPathHelpers.cs
+++ b/src/Compatibility/Core/src/iOS/CollectionView/IndexPathHelpers.cs
@@ -4,7 +4,7 @@ namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {
 	public static class IndexPathHelpers
 	{
-		public static NSIndexPath[] GenerateIndexPathRange(int section, int startIndex, int count) 
+		public static NSIndexPath[] GenerateIndexPathRange(int section, int startIndex, int count)
 		{
 			var result = new NSIndexPath[count];
 
@@ -33,7 +33,7 @@ public static NSIndexPath[] GenerateLoopedIndexPathRange(int section, int sectio
 			return result;
 		}
 
-		public static bool IsIndexPathValid(this IItemsViewSource source, NSIndexPath indexPath) 
+		public static bool IsIndexPathValid(this IItemsViewSource source, NSIndexPath indexPath)
 		{
 			if (indexPath.Section >= source.GroupCount)
 			{
diff --git a/src/Compatibility/Core/src/iOS/CollectionView/ItemsSourceFactory.cs b/src/Compatibility/Core/src/iOS/CollectionView/ItemsSourceFactory.cs
index da372d1f7cb0..8e15bb1dffd7 100644
--- a/src/Compatibility/Core/src/iOS/CollectionView/ItemsSourceFactory.cs
+++ b/src/Compatibility/Core/src/iOS/CollectionView/ItemsSourceFactory.cs
@@ -56,6 +56,6 @@ public static ILoopItemsViewSource CreateForCarouselView(IEnumerable itemsSource
 
 			return new LoopListSource(itemsSource, loop);
 		}
-		
+
 	}
 }
\ No newline at end of file
diff --git a/src/Compatibility/Core/src/iOS/CollectionView/ItemsViewController.cs b/src/Compatibility/Core/src/iOS/CollectionView/ItemsViewController.cs
index c8fe6fae4996..34a9bf58ffab 100644
--- a/src/Compatibility/Core/src/iOS/CollectionView/ItemsViewController.cs
+++ b/src/Compatibility/Core/src/iOS/CollectionView/ItemsViewController.cs
@@ -115,9 +115,9 @@ void CheckForEmptySource()
 
 			if (wasEmpty != _isEmpty)
 			{
-				 UpdateEmptyViewVisibility(_isEmpty);
+				UpdateEmptyViewVisibility(_isEmpty);
 			}
-			
+
 			if (wasEmpty && !_isEmpty)
 			{
 				// If we're going from empty to having stuff, it's possible that we've never actually measured
@@ -162,7 +162,7 @@ public override void ViewWillLayoutSubviews()
 			LayoutEmptyView();
 		}
 
-		void ConstrainToItemsView() 
+		void ConstrainToItemsView()
 		{
 			var itemsViewWidth = ItemsView.Width;
 			var itemsViewHeight = ItemsView.Height;
@@ -306,7 +306,7 @@ void CellLayoutAttributesChanged(object sender, LayoutAttributesChangedEventArgs
 			CacheCellAttributes(args.NewAttributes.IndexPath, args.NewAttributes.Size);
 		}
 
-		protected virtual void CacheCellAttributes(NSIndexPath indexPath, CGSize size) 
+		protected virtual void CacheCellAttributes(NSIndexPath indexPath, CGSize size)
 		{
 			if (!ItemsSource.IsIndexPathValid(indexPath))
 			{
@@ -373,7 +373,7 @@ protected virtual void RegisterViewTypes()
 
 		protected abstract bool IsHorizontal { get; }
 
-		protected virtual CGRect DetermineEmptyViewFrame() 
+		protected virtual CGRect DetermineEmptyViewFrame()
 		{
 			return new CGRect(CollectionView.Frame.X, CollectionView.Frame.Y,
 				CollectionView.Frame.Width, CollectionView.Frame.Height);
@@ -404,7 +404,7 @@ protected void OnFormsElementMeasureInvalidated(object sender, EventArgs e)
 		protected virtual void HandleFormsElementMeasureInvalidated(VisualElement formsElement)
 		{
 			RemeasureLayout(formsElement);
-        }
+		}
 
 		internal void UpdateView(object view, DataTemplate viewTemplate, ref UIView uiView, ref VisualElement formsElement)
 		{
@@ -461,7 +461,7 @@ void UpdateEmptyViewVisibility(bool isEmpty)
 			}
 		}
 
-		void AlignEmptyView() 
+		void AlignEmptyView()
 		{
 			if (_emptyUIView == null)
 			{
@@ -492,7 +492,7 @@ void FlipEmptyView()
 			_emptyUIView.Transform = CGAffineTransform.Scale(_emptyUIView.Transform, -1, 1);
 		}
 
-		void ShowEmptyView() 
+		void ShowEmptyView()
 		{
 			if (_emptyViewDisplayed || _emptyUIView == null)
 			{
@@ -513,7 +513,7 @@ void ShowEmptyView()
 			_emptyViewDisplayed = true;
 		}
 
-		void HideEmptyView() 
+		void HideEmptyView()
 		{
 			if (!_emptyViewDisplayed || _emptyUIView == null)
 			{
@@ -525,13 +525,13 @@ void HideEmptyView()
 			_emptyViewDisplayed = false;
 		}
 
-		void TearDownEmptyView() 
+		void TearDownEmptyView()
 		{
 			HideEmptyView();
 
 			// RemoveLogicalChild will trigger a disposal of the native view and its content
 			ItemsView.RemoveLogicalChild(_emptyViewFormsElement);
-			
+
 			_emptyUIView = null;
 			_emptyViewFormsElement = null;
 		}
@@ -559,11 +559,11 @@ TemplatedCell CreateAppropriateCellForLayout()
 			{
 				return new HorizontalCell(frame);
 			}
-			
+
 			return new VerticalCell(frame);
 		}
 
-		public UICollectionViewCell CreateMeasurementCell(NSIndexPath indexPath) 
+		public UICollectionViewCell CreateMeasurementCell(NSIndexPath indexPath)
 		{
 			if (ItemsView.ItemTemplate == null)
 			{
@@ -578,13 +578,13 @@ public UICollectionViewCell CreateMeasurementCell(NSIndexPath indexPath)
 				{
 					cell = new VerticalDefaultCell(frame);
 				}
-				
+
 				UpdateDefaultCell(cell, indexPath);
 				return cell;
 			}
 
-			TemplatedCell templatedCell = CreateAppropriateCellForLayout(); 
-						
+			TemplatedCell templatedCell = CreateAppropriateCellForLayout();
+
 			UpdateTemplatedCell(templatedCell, indexPath);
 
 			// Keep this cell around, we can transfer the contents to the actual cell when the UICollectionView creates it
@@ -593,7 +593,7 @@ public UICollectionViewCell CreateMeasurementCell(NSIndexPath indexPath)
 			return templatedCell;
 		}
 
-		internal CGSize GetSizeForItem(NSIndexPath indexPath) 
+		internal CGSize GetSizeForItem(NSIndexPath indexPath)
 		{
 			if (ItemsViewLayout.EstimatedItemSize.IsEmpty)
 			{
@@ -612,8 +612,8 @@ internal CGSize GetSizeForItem(NSIndexPath indexPath)
 
 			return ItemsViewLayout.EstimatedItemSize;
 		}
-		
-		internal protected virtual void UpdateVisibility() 
+
+		internal protected virtual void UpdateVisibility()
 		{
 			if (ItemsView.IsVisible)
 			{
diff --git a/src/Compatibility/Core/src/iOS/CollectionView/ItemsViewLayout.cs b/src/Compatibility/Core/src/iOS/CollectionView/ItemsViewLayout.cs
index fce0784b0b7a..fae1adb7de86 100644
--- a/src/Compatibility/Core/src/iOS/CollectionView/ItemsViewLayout.cs
+++ b/src/Compatibility/Core/src/iOS/CollectionView/ItemsViewLayout.cs
@@ -3,8 +3,8 @@
 using System.ComponentModel;
 using CoreGraphics;
 using Foundation;
-using UIKit;
 using Microsoft.Maui.Controls.Internals;
+using UIKit;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {
@@ -105,7 +105,7 @@ internal virtual void UpdateConstraints(CGSize size)
 			UpdateCellConstraints();
 		}
 
-		internal void SetInitialConstraints(CGSize size) 
+		internal void SetInitialConstraints(CGSize size)
 		{
 			_currentSize = size;
 			ConstrainTo(size);
@@ -123,7 +123,7 @@ public virtual UIEdgeInsets GetInsetForSection(UICollectionView collectionView,
 					return new UIEdgeInsets(0, 0, 0, (nfloat)gridItemsLayout.HorizontalItemSpacing * collectionView.NumberOfItemsInSection(section));
 				}
 
-				return new UIEdgeInsets(0,0, (nfloat)gridItemsLayout.VerticalItemSpacing * collectionView.NumberOfItemsInSection(section), 0);
+				return new UIEdgeInsets(0, 0, (nfloat)gridItemsLayout.VerticalItemSpacing * collectionView.NumberOfItemsInSection(section), 0);
 			}
 
 			return UIEdgeInsets.Zero;
@@ -247,7 +247,7 @@ protected void UpdateCellConstraints()
 			PrepareCellsForLayout(CollectionView.GetVisibleSupplementaryViews(UICollectionElementKindSectionKey.Footer));
 		}
 
-		void PrepareCellsForLayout(UICollectionReusableView[] cells) 
+		void PrepareCellsForLayout(UICollectionReusableView[] cells)
 		{
 			for (int n = 0; n < cells.Length; n++)
 			{
@@ -384,7 +384,7 @@ public override UICollectionViewLayoutInvalidationContext GetInvalidationContext
 					var defaultContext = base.GetInvalidationContext(preferredAttributes, originalAttributes);
 					return defaultContext;
 				}
-				catch (MonoTouchException ex) when (ex.Name == "NSRangeException") 
+				catch (MonoTouchException ex) when (ex.Name == "NSRangeException")
 				{
 					Controls.Internals.Log.Warning("ItemsViewLayout", ex.ToString());
 				}
@@ -569,7 +569,7 @@ public override bool ShouldInvalidateLayoutForBoundsChange(CGRect newBounds)
 			return true;
 		}
 
-		internal bool TryGetCachedCellSize(object item, out CGSize size) 
+		internal bool TryGetCachedCellSize(object item, out CGSize size)
 		{
 			if (_cellSizeCache.TryGetValue(item, out CGSize internalSize))
 			{
@@ -581,12 +581,12 @@ internal bool TryGetCachedCellSize(object item, out CGSize size)
 			return false;
 		}
 
-		internal void CacheCellSize(object item, CGSize size) 
+		internal void CacheCellSize(object item, CGSize size)
 		{
 			_cellSizeCache[item] = size;
 		}
 
-		internal void ClearCellSizeCache() 
+		internal void ClearCellSizeCache()
 		{
 			_cellSizeCache.Clear();
 		}
diff --git a/src/Compatibility/Core/src/iOS/CollectionView/ItemsViewRenderer.cs b/src/Compatibility/Core/src/iOS/CollectionView/ItemsViewRenderer.cs
index 6e574d5f1664..699a6ad140be 100644
--- a/src/Compatibility/Core/src/iOS/CollectionView/ItemsViewRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/CollectionView/ItemsViewRenderer.cs
@@ -147,7 +147,7 @@ protected virtual void UpdateItemsSource()
 			Controller.UpdateItemsSource();
 		}
 
-		protected virtual void UpdateVisibility() 
+		protected virtual void UpdateVisibility()
 		{
 			Controller?.UpdateVisibility();
 		}
diff --git a/src/Compatibility/Core/src/iOS/CollectionView/ListSource.cs b/src/Compatibility/Core/src/iOS/CollectionView/ListSource.cs
index 0afb1c778da6..97743997a0c2 100644
--- a/src/Compatibility/Core/src/iOS/CollectionView/ListSource.cs
+++ b/src/Compatibility/Core/src/iOS/CollectionView/ListSource.cs
@@ -13,7 +13,7 @@ public ListSource()
 
 		public ListSource(IEnumerable<object> enumerable) : base(enumerable)
 		{
-			
+
 		}
 
 		public ListSource(IEnumerable enumerable)
diff --git a/src/Compatibility/Core/src/iOS/CollectionView/ObservableGroupedSource.cs b/src/Compatibility/Core/src/iOS/CollectionView/ObservableGroupedSource.cs
index ae6d240029b5..99a55a783b5c 100644
--- a/src/Compatibility/Core/src/iOS/CollectionView/ObservableGroupedSource.cs
+++ b/src/Compatibility/Core/src/iOS/CollectionView/ObservableGroupedSource.cs
@@ -343,7 +343,7 @@ bool ReloadRequired()
 				|| _collectionView.NumberOfSections() == 0;
 		}
 
-		void Update(Action update) 
+		void Update(Action update)
 		{
 			if (_collectionView.Hidden)
 			{
diff --git a/src/Compatibility/Core/src/iOS/CollectionView/ObservableItemsSource.cs b/src/Compatibility/Core/src/iOS/CollectionView/ObservableItemsSource.cs
index d2975f160aa2..de2ed3d938f5 100644
--- a/src/Compatibility/Core/src/iOS/CollectionView/ObservableItemsSource.cs
+++ b/src/Compatibility/Core/src/iOS/CollectionView/ObservableItemsSource.cs
@@ -19,7 +19,7 @@ public ObservableItemsSource(IEnumerable itemSource, UICollectionViewController
 		{
 			_collectionViewController = collectionViewController;
 			CollectionView = _collectionViewController.CollectionView;
-		
+
 			_section = group < 0 ? 0 : group;
 			_grouped = group >= 0;
 
@@ -178,7 +178,7 @@ void Remove(NotifyCollectionChangedEventArgs args)
 			}
 
 			// If we have a start index, we can be more clever about removing the item(s) (and get the nifty animations)
-			var count = args.OldItems.Count; 
+			var count = args.OldItems.Count;
 			Count -= count;
 
 			Update(() => CollectionView.DeleteItems(CreateIndexesFrom(startIndex, count)), args);
@@ -273,12 +273,12 @@ void Update(Action update, NotifyCollectionChangedEventArgs args)
 				return;
 			}
 
-			OnCollectionViewUpdating(args); 
-			update(); 
-			OnCollectionViewUpdated(args); 
+			OnCollectionViewUpdating(args);
+			update();
+			OnCollectionViewUpdated(args);
 		}
 
-		void OnCollectionViewUpdating(NotifyCollectionChangedEventArgs args) 
+		void OnCollectionViewUpdating(NotifyCollectionChangedEventArgs args)
 		{
 			CollectionViewUpdating?.Invoke(this, args);
 		}
diff --git a/src/Compatibility/Core/src/iOS/CollectionView/ScrollToPositionExtensions.cs b/src/Compatibility/Core/src/iOS/CollectionView/ScrollToPositionExtensions.cs
index 4a06bfe56d51..3f6a026b1a2b 100644
--- a/src/Compatibility/Core/src/iOS/CollectionView/ScrollToPositionExtensions.cs
+++ b/src/Compatibility/Core/src/iOS/CollectionView/ScrollToPositionExtensions.cs
@@ -4,7 +4,7 @@ namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {
 	public static class ScrollToPositionExtensions
 	{
-		public static UICollectionViewScrollPosition ToCollectionViewScrollPosition(this ScrollToPosition scrollToPosition, 
+		public static UICollectionViewScrollPosition ToCollectionViewScrollPosition(this ScrollToPosition scrollToPosition,
 			UICollectionViewScrollDirection scrollDirection = UICollectionViewScrollDirection.Vertical, bool isLtr = false)
 		{
 			if (scrollDirection == UICollectionViewScrollDirection.Horizontal)
diff --git a/src/Compatibility/Core/src/iOS/CollectionView/SelectableItemsViewController.cs b/src/Compatibility/Core/src/iOS/CollectionView/SelectableItemsViewController.cs
index 0c27faeaf24e..0d9a25d377a9 100644
--- a/src/Compatibility/Core/src/iOS/CollectionView/SelectableItemsViewController.cs
+++ b/src/Compatibility/Core/src/iOS/CollectionView/SelectableItemsViewController.cs
@@ -8,7 +8,7 @@ namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 	public class SelectableItemsViewController<TItemsView> : StructuredItemsViewController<TItemsView>
 		where TItemsView : SelectableItemsView
 	{
-		public SelectableItemsViewController(TItemsView selectableItemsView, ItemsViewLayout layout) 
+		public SelectableItemsViewController(TItemsView selectableItemsView, ItemsViewLayout layout)
 			: base(selectableItemsView, layout)
 		{
 		}
@@ -110,7 +110,7 @@ internal void UpdateNativeSelection()
 						// SelectedItem has been set to null; if an item is selected, we need to de-select it
 						ClearSelection();
 					}
-				
+
 					return;
 				case SelectionMode.Multiple:
 					SynchronizeNativeSelectionWithSelectedItems();
diff --git a/src/Compatibility/Core/src/iOS/CollectionView/SelectableItemsViewDelegator.cs b/src/Compatibility/Core/src/iOS/CollectionView/SelectableItemsViewDelegator.cs
index 79cecfa95970..88ae397a0878 100644
--- a/src/Compatibility/Core/src/iOS/CollectionView/SelectableItemsViewDelegator.cs
+++ b/src/Compatibility/Core/src/iOS/CollectionView/SelectableItemsViewDelegator.cs
@@ -7,7 +7,7 @@ public class SelectableItemsViewDelegator<TItemsView, TViewController> : ItemsVi
 		where TItemsView : SelectableItemsView
 		where TViewController : SelectableItemsViewController<TItemsView>
 	{
-		public SelectableItemsViewDelegator(ItemsViewLayout itemsViewLayout, TViewController itemsViewController) 
+		public SelectableItemsViewDelegator(ItemsViewLayout itemsViewLayout, TViewController itemsViewController)
 			: base(itemsViewLayout, itemsViewController)
 		{
 		}
diff --git a/src/Compatibility/Core/src/iOS/CollectionView/StructuredItemsViewController.cs b/src/Compatibility/Core/src/iOS/CollectionView/StructuredItemsViewController.cs
index 8cdfd05abf09..bbc112ee20d3 100644
--- a/src/Compatibility/Core/src/iOS/CollectionView/StructuredItemsViewController.cs
+++ b/src/Compatibility/Core/src/iOS/CollectionView/StructuredItemsViewController.cs
@@ -69,7 +69,7 @@ protected override CGRect DetermineEmptyViewFrame()
 			if (footerView != null)
 				footerHeight = footerView.Frame.Height;
 
-			return new CGRect(CollectionView.Frame.X, CollectionView.Frame.Y, CollectionView.Frame.Width, 
+			return new CGRect(CollectionView.Frame.X, CollectionView.Frame.Y, CollectionView.Frame.Width,
 				Math.Abs(CollectionView.Frame.Height - (headerHeight + footerHeight)));
 		}
 
diff --git a/src/Compatibility/Core/src/iOS/CollectionView/TemplateHelpers.cs b/src/Compatibility/Core/src/iOS/CollectionView/TemplateHelpers.cs
index 35824d900eaa..2a280fc17afc 100644
--- a/src/Compatibility/Core/src/iOS/CollectionView/TemplateHelpers.cs
+++ b/src/Compatibility/Core/src/iOS/CollectionView/TemplateHelpers.cs
@@ -1,6 +1,6 @@
 using System;
-using UIKit;
 using Microsoft.Maui.Controls.Internals;
+using UIKit;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {
diff --git a/src/Compatibility/Core/src/iOS/CollectionView/TemplatedCell.cs b/src/Compatibility/Core/src/iOS/CollectionView/TemplatedCell.cs
index 768cd6ea2dc8..deb3a7708029 100644
--- a/src/Compatibility/Core/src/iOS/CollectionView/TemplatedCell.cs
+++ b/src/Compatibility/Core/src/iOS/CollectionView/TemplatedCell.cs
@@ -1,9 +1,9 @@
 using System;
 using CoreGraphics;
 using Foundation;
-using UIKit;
 using Microsoft.Maui.Controls.Internals;
 using Microsoft.Maui.Graphics;
+using UIKit;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {
@@ -75,7 +75,7 @@ public override UICollectionViewLayoutAttributes PreferredLayoutAttributesFittin
 			return preferredAttributes;
 		}
 
-		CGSize UpdateCellSize() 
+		CGSize UpdateCellSize()
 		{
 			// Measure this cell (including the Forms element) if there is no constrained size
 			var size = ConstrainedSize == default ? Measure() : ConstrainedSize;
diff --git a/src/Compatibility/Core/src/iOS/CollectionView/VerticalSupplementaryView.cs b/src/Compatibility/Core/src/iOS/CollectionView/VerticalSupplementaryView.cs
index 673d625f89ae..71df05ae5e64 100644
--- a/src/Compatibility/Core/src/iOS/CollectionView/VerticalSupplementaryView.cs
+++ b/src/Compatibility/Core/src/iOS/CollectionView/VerticalSupplementaryView.cs
@@ -21,10 +21,10 @@ public override CGSize Measure()
 				return CGSize.Empty;
 			}
 
-			var measure = VisualElementRenderer.Element.Measure(ConstrainedDimension, 
+			var measure = VisualElementRenderer.Element.Measure(ConstrainedDimension,
 				double.PositiveInfinity, MeasureFlags.IncludeMargins);
 
-			var height = VisualElementRenderer.Element.Height > 0 
+			var height = VisualElementRenderer.Element.Height > 0
 				? VisualElementRenderer.Element.Height : measure.Request.Height;
 
 			return new CGSize(ConstrainedDimension, height);
diff --git a/src/Compatibility/Core/src/iOS/CollectionView/WidthConstrainedTemplatedCell.cs b/src/Compatibility/Core/src/iOS/CollectionView/WidthConstrainedTemplatedCell.cs
index b37a12aadc01..9deea650aa4e 100644
--- a/src/Compatibility/Core/src/iOS/CollectionView/WidthConstrainedTemplatedCell.cs
+++ b/src/Compatibility/Core/src/iOS/CollectionView/WidthConstrainedTemplatedCell.cs
@@ -34,7 +34,7 @@ protected override (bool, Size) NeedsContentSizeUpdate(Size currentSize)
 				return (false, size);
 			}
 
-			var desiredBounds = VisualElementRenderer.Element.Measure(bounds.Width, double.PositiveInfinity, 
+			var desiredBounds = VisualElementRenderer.Element.Measure(bounds.Width, double.PositiveInfinity,
 				MeasureFlags.IncludeMargins);
 
 			if (desiredBounds.Request.Height == currentSize.Height)
diff --git a/src/Compatibility/Core/src/iOS/Compatibility.iOS.csproj b/src/Compatibility/Core/src/iOS/Compatibility.iOS.csproj
index cdf011c063f0..4a710cdc669f 100644
--- a/src/Compatibility/Core/src/iOS/Compatibility.iOS.csproj
+++ b/src/Compatibility/Core/src/iOS/Compatibility.iOS.csproj
@@ -52,6 +52,10 @@
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\AppHostBuilderExtensions.cs" Link="AppHostBuilderExtensions.cs" />
+    <Compile Include="..\MauiHandlersCollectionExtensions.cs" Link="MauiHandlersCollectionExtensions.cs" />
+  </ItemGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)ContextActionCell.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ContextScrollViewDelegate.cs" />
@@ -112,18 +116,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Renderers\TimePickerRenderer.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Properties\AssemblyInfo.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\CellExtensions.cs" />
-    <Compile Include="..\..\..\..\Controls\src\Core\Crc64.cs">
-      <Link>Crc64.cs</Link>
-    </Compile>
-    <Compile Include="..\..\..\..\Controls\src\Core\StreamWrapper.cs">
-      <Link>StreamWrapper.cs</Link>
-    </Compile>
-    <Compile Include="..\AppHostBuilderExtensions.cs">
-      <Link>AppHostBuilderExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\MauiHandlersCollectionExtensions.cs">
-      <Link>MauiHandlersCollectionExtensions.cs</Link>
-    </Compile>
     <Compile Include="CADisplayLinkTicker.cs" />
     <Compile Include="CollectionView\CarouselViewDelegator.cs" />
     <Compile Include="CollectionView\CarouselViewRenderer.cs" />
@@ -184,7 +176,6 @@
     <Compile Include="Flags.cs" />
     <Compile Include="HandlerToRendererShim.cs" />
     <Compile Include="IOSDeviceInfo.cs" />
-    <Compile Include="LinkerSafeAttribute.cs" />
     <Compile Include="ModalWrapper.cs" />
     <Compile Include="Renderers\FormsCAKeyFrameAnimation.cs" />
     <Compile Include="Renderers\FormsCheckBox.cs" />
@@ -282,12 +273,10 @@
     <Compile Include="Shapes\PolygonRenderer.cs" />
     <Compile Include="Shapes\PolylineRenderer.cs" />
     <Compile Include="Shapes\RectangleRenderer.cs" />
-    <Compile Include="Extensions\BrushExtensions.cs" />
     <Compile Include="CollectionView\LoopObservableItemsSource.cs" />
     <Compile Include="CollectionView\LoopListSource.cs" />
     <Compile Include="CollectionView\ILoopItemsViewSource.cs" />
     <Compile Include="Renderers\IDisconnectable.cs" />
-    <Compile Include="Extensions\BrushExtensions.shared.cs" />
     <Compile Include="Renderers\ShellFlyoutHeaderContainer.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Compatibility/Core/src/iOS/ContextActionCell.cs b/src/Compatibility/Core/src/iOS/ContextActionCell.cs
index bf071c59ba3d..ae2507a62b22 100644
--- a/src/Compatibility/Core/src/iOS/ContextActionCell.cs
+++ b/src/Compatibility/Core/src/iOS/ContextActionCell.cs
@@ -3,8 +3,8 @@
 using System.Collections.Specialized;
 using System.ComponentModel;
 using Foundation;
-using UIKit;
 using Microsoft.Maui.Controls.Compatibility.Platform.iOS.Resources;
+using UIKit;
 using PointF = CoreGraphics.CGPoint;
 using RectangleF = CoreGraphics.CGRect;
 using SizeF = CoreGraphics.CGSize;
@@ -130,7 +130,7 @@ public override void RemoveFromSuperview()
 		public void Update(UITableView tableView, Cell cell, UITableViewCell nativeCell)
 		{
 			var parentListView = cell.RealParent as ListView;
-			var recycling = parentListView != null && 
+			var recycling = parentListView != null &&
 				((parentListView.CachingStrategy & ListViewCachingStrategy.RecycleElement) != 0);
 			if (_cell != cell && recycling)
 			{
@@ -182,7 +182,7 @@ public void Update(UITableView tableView, Cell cell, UITableViewCell nativeCell)
 				_scroller = new UIScrollView(new RectangleF(0, 0, width, height));
 				_scroller.ScrollsToTop = false;
 				_scroller.ShowsHorizontalScrollIndicator = false;
-				
+
 				_scroller.PreservesSuperviewLayoutMargins = true;
 
 				ContentView.AddSubview(_scroller);
@@ -489,7 +489,7 @@ void OnCellPropertyChanged(object sender, PropertyChangedEventArgs e)
 		void OnContextItemsChanged(object sender, NotifyCollectionChangedEventArgs e)
 		{
 			var parentListView = _cell?.RealParent as ListView;
-			var recycling = parentListView != null && 
+			var recycling = parentListView != null &&
 				((parentListView.CachingStrategy & ListViewCachingStrategy.RecycleElement) != 0);
 			if (recycling)
 				Update(_tableView, _cell, ContentCell);
@@ -501,7 +501,7 @@ void OnContextItemsChanged(object sender, NotifyCollectionChangedEventArgs e)
 		void OnMenuItemPropertyChanged(object sender, PropertyChangedEventArgs e)
 		{
 			var parentListView = _cell.RealParent as ListView;
-			var recycling = parentListView != null && 
+			var recycling = parentListView != null &&
 				((parentListView.CachingStrategy & ListViewCachingStrategy.RecycleElement) != 0);
 			if (recycling)
 				Update(_tableView, _cell, ContentCell);
diff --git a/src/Compatibility/Core/src/iOS/ContextScrollViewDelegate.cs b/src/Compatibility/Core/src/iOS/ContextScrollViewDelegate.cs
index bc73b8571f9d..a6319d9dfb5f 100644
--- a/src/Compatibility/Core/src/iOS/ContextScrollViewDelegate.cs
+++ b/src/Compatibility/Core/src/iOS/ContextScrollViewDelegate.cs
@@ -76,7 +76,7 @@ public override void DraggingStarted(UIScrollView scrollView)
 				return;
 
 			s_scrollViewBeingScrolled = new WeakReference<UIScrollView>(scrollView);
-			
+
 			if (!IsOpen)
 				SetButtonsShowing(true);
 
@@ -202,8 +202,8 @@ static bool ShouldIgnoreScrolling(UIScrollView scrollView)
 				return false;
 
 			UIScrollView scrollViewBeingScrolled;
-			if (!s_scrollViewBeingScrolled.TryGetTarget(out scrollViewBeingScrolled) 
-				|| ReferenceEquals(scrollViewBeingScrolled, scrollView) 
+			if (!s_scrollViewBeingScrolled.TryGetTarget(out scrollViewBeingScrolled)
+				|| ReferenceEquals(scrollViewBeingScrolled, scrollView)
 				|| !ReferenceEquals(((ContextScrollViewDelegate)scrollViewBeingScrolled.Delegate)?._table, ((ContextScrollViewDelegate)scrollView.Delegate)?._table))
 				return false;
 
diff --git a/src/Compatibility/Core/src/iOS/Deserializer.cs b/src/Compatibility/Core/src/iOS/Deserializer.cs
index 753a800c5885..fd767aa65b03 100644
--- a/src/Compatibility/Core/src/iOS/Deserializer.cs
+++ b/src/Compatibility/Core/src/iOS/Deserializer.cs
@@ -5,7 +5,6 @@
 using System.Runtime.Serialization;
 using System.Threading.Tasks;
 using System.Xml;
-using Microsoft.Maui.Controls.Compatibility.Internals;
 using Microsoft.Maui.Controls.Internals;
 
 #if __MOBILE__
diff --git a/src/Compatibility/Core/src/iOS/DragAndDropDelegate.cs b/src/Compatibility/Core/src/iOS/DragAndDropDelegate.cs
index fdabe033d587..4a89fc1eb4cf 100644
--- a/src/Compatibility/Core/src/iOS/DragAndDropDelegate.cs
+++ b/src/Compatibility/Core/src/iOS/DragAndDropDelegate.cs
@@ -49,7 +49,7 @@ public bool CanHandleSession(UIDropInteraction interaction, IUIDropSession sessi
 			{
 				return true;
 			}
-			
+
 			return false;
 		}
 
@@ -85,8 +85,8 @@ public UIDropProposal SessionDidUpdate(UIDropInteraction interaction, IUIDropSes
 			if (interaction.View is IVisualElementRenderer renderer)
 			{
 				DataPackage package = null;
-					
-				if(session.LocalDragSession.Items.Length > 0 &&
+
+				if (session.LocalDragSession.Items.Length > 0 &&
 					session.LocalDragSession.Items[0].LocalObject is CustomLocalStateData cdi)
 				{
 					package = cdi.DataPackage;
@@ -108,9 +108,9 @@ public void PerformDrop(UIDropInteraction interaction, IUIDropSession session)
 			if (session.LocalDragSession == null)
 				return;
 
-			if(session.LocalDragSession.Items.Length > 0 && 
+			if (session.LocalDragSession.Items.Length > 0 &&
 				session.LocalDragSession.Items[0].LocalObject is CustomLocalStateData cdi &&
-				interaction.View is IVisualElementRenderer renderer && 
+				interaction.View is IVisualElementRenderer renderer &&
 				renderer.Element is View view)
 			{
 				HandleDrop(view, cdi.DataPackage);
@@ -130,7 +130,7 @@ void SendEventArgs<TRecognizer>(Action<TRecognizer> func, View view)
 
 			foreach (var gesture in gestures)
 			{
-				if(gesture is TRecognizer recognizer)
+				if (gesture is TRecognizer recognizer)
 					func(recognizer);
 			}
 		}
@@ -189,7 +189,7 @@ public UIDragItem[] HandleDragStarting(View element, IVisualElementRenderer rend
 
 					returnValue = new UIDragItem[] { dragItem };
 				}
-			}, 
+			},
 			element);
 
 			return returnValue ?? new UIDragItem[0];
@@ -264,4 +264,3 @@ class CustomLocalStateData : NSObject
 
 }
 #endif
-	  
\ No newline at end of file
diff --git a/src/Compatibility/Core/src/iOS/EventTracker.cs b/src/Compatibility/Core/src/iOS/EventTracker.cs
index 9371c23ddb9a..db086ac72205 100644
--- a/src/Compatibility/Core/src/iOS/EventTracker.cs
+++ b/src/Compatibility/Core/src/iOS/EventTracker.cs
@@ -222,7 +222,7 @@ Action<UITapGestureRecognizer> CreateChildRecognizerHandler(WeakReference weakEv
 
 				var recognizers = childGestures?.GetChildGesturesFor<TapGestureRecognizer>(x => x.NumberOfTapsRequired == (int)sender.NumberOfTapsRequired);
 
-				if(recognizers == null)
+				if (recognizers == null)
 					return;
 
 				var tapGestureRecognizer = ((ChildGestureRecognizer)weakRecognizer.Target).GestureRecognizer as TapGestureRecognizer;
@@ -576,7 +576,7 @@ void LoadRecognizers()
 
 			if (_dragAndDropDelegate != null)
 			{
-				foreach(var interaction in _renderer.NativeView.Interactions)
+				foreach (var interaction in _renderer.NativeView.Interactions)
 				{
 					if (interaction is UIDragInteraction uIDrag && uIDrag.Delegate == _dragAndDropDelegate)
 						uIDragInteraction = uIDrag;
@@ -607,7 +607,7 @@ void LoadRecognizers()
 				}
 
 #if __MOBILE__
-				if(Forms.IsiOS11OrNewer && recognizer is DragGestureRecognizer)
+				if (Forms.IsiOS11OrNewer && recognizer is DragGestureRecognizer)
 				{
 					dragFound = true;
 					_dragAndDropDelegate = _dragAndDropDelegate ?? new DragAndDropDelegate();
diff --git a/src/Compatibility/Core/src/iOS/Extensions/BrushExtensions.shared.cs b/src/Compatibility/Core/src/iOS/Extensions/BrushExtensions.shared.cs
deleted file mode 100644
index f59b9fa9017b..000000000000
--- a/src/Compatibility/Core/src/iOS/Extensions/BrushExtensions.shared.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using CoreGraphics;
-using Foundation;
-using Microsoft.Maui.Graphics;
-
-#if __MOBILE__
-namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
-#else
-namespace Microsoft.Maui.Controls.Compatibility.Platform.MacOS
-#endif
-{
-	public partial class BrushExtensions
-	{
-		static CGPoint GetRadialGradientBrushEndPoint(Point startPoint, double radius)
-		{
-			double x = startPoint.X == 1 ? (startPoint.X - radius) : (startPoint.X + radius);
-
-			if (x < 0)
-				x = 0;
-
-			if (x > 1)
-				x = 1;
-
-			double y = startPoint.Y == 1 ? (startPoint.Y - radius) : (startPoint.Y + radius);
-
-			if (y < 0)
-				y = 0;
-
-			if (y > 1)
-				y = 1;
-
-			return new CGPoint(x, y);
-		}
-
-		static NSNumber[] GetCAGradientLayerLocations(List<GradientStop> gradientStops)
-		{
-			if (gradientStops == null || gradientStops.Count == 0)
-				return new NSNumber[0];
-
-			if (gradientStops.Count > 1 && gradientStops.Any(gt => gt.Offset != 0))
-				return gradientStops.Select(x => new NSNumber(x.Offset)).ToArray();
-			else
-			{
-				int itemCount = gradientStops.Count;
-				int index = 0;
-				float step = 1.0f / itemCount;
-
-				NSNumber[] locations = new NSNumber[itemCount];
-
-				foreach (var gradientStop in gradientStops)
-				{
-					float location = step * index;
-					bool setLocation = !gradientStops.Any(gt => gt.Offset > location);
-
-					if (gradientStop.Offset == 0 && setLocation)
-						locations[index] = new NSNumber(location);
-					else
-						locations[index] = new NSNumber(gradientStop.Offset);
-
-					index++;
-				}
-
-				return locations;
-			}
-		}
-	}
-}
diff --git a/src/Compatibility/Core/src/iOS/Extensions/DoubleCollectionExtensions.cs b/src/Compatibility/Core/src/iOS/Extensions/DoubleCollectionExtensions.cs
index 6d1030bca1db..91d27c3ee0a1 100644
--- a/src/Compatibility/Core/src/iOS/Extensions/DoubleCollectionExtensions.cs
+++ b/src/Compatibility/Core/src/iOS/Extensions/DoubleCollectionExtensions.cs
@@ -6,22 +6,22 @@ namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 namespace Microsoft.Maui.Controls.Compatibility.Platform.MacOS
 #endif
 {
-    public static class DoubleCollectionExtensions
-    {
-        public static nfloat[] ToArray(this DoubleCollection doubleCollection)
-        {
-            if (doubleCollection == null || doubleCollection.Count == 0)
-                return new nfloat[0];
-            else
-            {
+	public static class DoubleCollectionExtensions
+	{
+		public static nfloat[] ToArray(this DoubleCollection doubleCollection)
+		{
+			if (doubleCollection == null || doubleCollection.Count == 0)
+				return new nfloat[0];
+			else
+			{
 
-                nfloat[] array = new nfloat[doubleCollection.Count];
+				nfloat[] array = new nfloat[doubleCollection.Count];
 
-                for (int i = 0; i < doubleCollection.Count; i++)
-                    array[i] = (nfloat)doubleCollection[i];
+				for (int i = 0; i < doubleCollection.Count; i++)
+					array[i] = (nfloat)doubleCollection[i];
 
-                return array;
-            }
-        }
-    }
+				return array;
+			}
+		}
+	}
 }
\ No newline at end of file
diff --git a/src/Compatibility/Core/src/iOS/Extensions/Extensions.cs b/src/Compatibility/Core/src/iOS/Extensions/Extensions.cs
index 5592b890d2ae..14d6e906c65b 100644
--- a/src/Compatibility/Core/src/iOS/Extensions/Extensions.cs
+++ b/src/Compatibility/Core/src/iOS/Extensions/Extensions.cs
@@ -1,8 +1,6 @@
-using Foundation;
 using System;
-using UIKit;
-using Microsoft.Maui.Controls.Compatibility.Internals;
 using Microsoft.Maui.Controls.Internals;
+using UIKit;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {
diff --git a/src/Compatibility/Core/src/iOS/Extensions/FlowDirectionExtensions.cs b/src/Compatibility/Core/src/iOS/Extensions/FlowDirectionExtensions.cs
index e3e8f7176d21..07087417cd1e 100644
--- a/src/Compatibility/Core/src/iOS/Extensions/FlowDirectionExtensions.cs
+++ b/src/Compatibility/Core/src/iOS/Extensions/FlowDirectionExtensions.cs
@@ -1,5 +1,4 @@
 using UIKit;
-using Microsoft.Maui.Controls.Compatibility.Internals;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {
diff --git a/src/Compatibility/Core/src/iOS/Extensions/FontExtensions.cs b/src/Compatibility/Core/src/iOS/Extensions/FontExtensions.cs
index fa01b9205ed9..af175a7b3d92 100644
--- a/src/Compatibility/Core/src/iOS/Extensions/FontExtensions.cs
+++ b/src/Compatibility/Core/src/iOS/Extensions/FontExtensions.cs
@@ -6,10 +6,10 @@ namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 	public static partial class FontExtensions
 	{
 		public static UIFont ToUIFont(this Font self)
-			=> Forms.FontManager.GetFont(self);
+			=> CompatServiceProvider.FontManager.GetFont(self);
 
 		internal static UIFont ToUIFont(this IFontElement self)
-			=> Forms.FontManager.GetFont(Font.OfSize(self.FontFamily, self.FontSize).WithAttributes(self.FontAttributes));
+			=> CompatServiceProvider.FontManager.GetFont(Font.OfSize(self.FontFamily, self.FontSize).WithAttributes(self.FontAttributes));
 
 		internal static bool IsDefault(this IFontElement self)
 			=> self.FontFamily == null && self.FontSize == Device.GetNamedSize(NamedSize.Default, typeof(Label), true) && self.FontAttributes == FontAttributes.None;
diff --git a/src/Compatibility/Core/src/iOS/Extensions/GeometryExtensions.cs b/src/Compatibility/Core/src/iOS/Extensions/GeometryExtensions.cs
index 88e62a14153c..75512b9b6139 100644
--- a/src/Compatibility/Core/src/iOS/Extensions/GeometryExtensions.cs
+++ b/src/Compatibility/Core/src/iOS/Extensions/GeometryExtensions.cs
@@ -11,194 +11,194 @@ namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 namespace Microsoft.Maui.Controls.Compatibility.Platform.MacOS
 #endif
 {
-    public static class GeometryExtensions
-    {
-        public static PathData ToCGPath(this Geometry geometry, Transform renderTransform = null)
-        {
-            PathData pathData = new PathData
-            {
-                Data = new CGPath()
-            };
-
-            CGAffineTransform transform;
-
-            if (renderTransform == null)
-                transform = CGAffineTransform.MakeIdentity();
-            else
-                transform = renderTransform.ToCGAffineTransform();
-
-            if (geometry is LineGeometry)
-            {
-                LineGeometry lineGeometry = geometry as LineGeometry;
-                pathData.Data.MoveToPoint(transform, lineGeometry.StartPoint.ToPointF());
-                pathData.Data.AddLineToPoint(transform, lineGeometry.EndPoint.ToPointF());
-            }
-            else if (geometry is RectangleGeometry)
-            {
-                var rect = (geometry as RectangleGeometry).Rect;
-                pathData.Data.AddRect(transform, new CGRect(rect.X, rect.Y, rect.Width, rect.Height));
-            }
-            else if (geometry is EllipseGeometry)
-            {
-                EllipseGeometry ellipseGeometry = geometry as EllipseGeometry;
-
-                CGRect rect = new CGRect(
-                    ellipseGeometry.Center.X - ellipseGeometry.RadiusX,
-                    ellipseGeometry.Center.Y - ellipseGeometry.RadiusY,
-                    ellipseGeometry.RadiusX * 2,
-                    ellipseGeometry.RadiusY * 2);
-
-                pathData.Data.AddEllipseInRect(transform, rect);
-            }
-            else if (geometry is GeometryGroup)
-            {
-                GeometryGroup geometryGroup = geometry as GeometryGroup;
-
-                pathData.IsNonzeroFillRule = geometryGroup.FillRule == FillRule.Nonzero;
-
-                foreach (Geometry child in geometryGroup.Children)
-                {
-                    PathData pathChild = child.ToCGPath(renderTransform);
-                    pathData.Data.AddPath(pathChild.Data);
-                }
-            }
-            else if (geometry is PathGeometry)
-            {
-                PathGeometry pathGeometry = geometry as PathGeometry;
-
-                pathData.IsNonzeroFillRule = pathGeometry.FillRule == FillRule.Nonzero;
-
-                foreach (PathFigure pathFigure in pathGeometry.Figures)
-                {
-                    pathData.Data.MoveToPoint(transform, pathFigure.StartPoint.ToPointF());
-                    Point lastPoint = pathFigure.StartPoint;
-
-                    foreach (PathSegment pathSegment in pathFigure.Segments)
-                    {
-                        // LineSegment
-                        if (pathSegment is LineSegment)
-                        {
-                            LineSegment lineSegment = pathSegment as LineSegment;
-
-                            pathData.Data.AddLineToPoint(transform, lineSegment.Point.ToPointF());
-                            lastPoint = lineSegment.Point;
-                        }
-                        // PolyLineSegment
-                        else if (pathSegment is PolyLineSegment)
-                        {
-                            PolyLineSegment polylineSegment = pathSegment as PolyLineSegment;
-                            PointCollection points = polylineSegment.Points;
-
-                            for (int i = 0; i < points.Count; i++)
-                                pathData.Data.AddLineToPoint(transform, points[i].ToPointF());
-
-                            lastPoint = points[points.Count - 1];
-                        }
-
-                        // BezierSegment
-                        if (pathSegment is BezierSegment)
-                        {
-                            BezierSegment bezierSegment = pathSegment as BezierSegment;
-
-                            pathData.Data.AddCurveToPoint(
-                                transform,
-                                bezierSegment.Point1.ToPointF(),
-                                bezierSegment.Point2.ToPointF(),
-                                bezierSegment.Point3.ToPointF());
-
-                            lastPoint = bezierSegment.Point3;
-                        }
-                        // PolyBezierSegment
-                        else if (pathSegment is PolyBezierSegment)
-                        {
-                            PolyBezierSegment polyBezierSegment = pathSegment as PolyBezierSegment;
-                            PointCollection points = polyBezierSegment.Points;
-
-                            if (points.Count >= 3)
-                            {
-                                for (int i = 0; i < points.Count; i += 3)
-                                {
-                                    pathData.Data.AddCurveToPoint(
-                                        transform,
-                                        points[i].ToPointF(),
-                                        points[i + 1].ToPointF(),
-                                        points[i + 2].ToPointF());
-                                }
-                            }
-
-                            lastPoint = points[points.Count - 1];
-                        }
-
-                        // QuadraticBezierSegment
-                        if (pathSegment is QuadraticBezierSegment)
-                        {
-                            QuadraticBezierSegment bezierSegment = pathSegment as QuadraticBezierSegment;
-
-                            pathData.Data.AddQuadCurveToPoint(
-                                transform,
-                                new nfloat(bezierSegment.Point1.X),
-                                new nfloat(bezierSegment.Point1.Y),
-                                new nfloat(bezierSegment.Point2.X),
-                                new nfloat(bezierSegment.Point2.Y));
-
-                            lastPoint = bezierSegment.Point2;
-                        }
-                        // PolyQuadraticBezierSegment
-                        else if (pathSegment is PolyQuadraticBezierSegment)
-                        {
-                            PolyQuadraticBezierSegment polyBezierSegment = pathSegment as PolyQuadraticBezierSegment;
-                            PointCollection points = polyBezierSegment.Points;
-
-                            if (points.Count >= 2)
-                            {
-                                for (int i = 0; i < points.Count; i += 2)
-                                {
-                                    pathData.Data.AddQuadCurveToPoint(
-                                        transform,
-                                        new nfloat(points[i + 0].X),
-                                        new nfloat(points[i + 0].Y),
-                                        new nfloat(points[i + 1].X),
-                                        new nfloat(points[i + 1].Y));
-                                }
-                            }
-
-                            lastPoint = points[points.Count - 1];
-                        }
-                        // ArcSegment
-                        else if (pathSegment is ArcSegment)
-                        {
-                            ArcSegment arcSegment = pathSegment as ArcSegment;
-
-                            List<Point> points = new List<Point>();
-
-                            GeometryHelper.FlattenArc(
-                                points,
-                                lastPoint,
-                                arcSegment.Point,
-                                arcSegment.Size.Width,
-                                arcSegment.Size.Height,
-                                arcSegment.RotationAngle,
-                                arcSegment.IsLargeArc,
-                                arcSegment.SweepDirection == SweepDirection.CounterClockwise,
-                                1);
-
-                            CGPoint[] cgpoints = new CGPoint[points.Count];
-
-                            for (int i = 0; i < points.Count; i++)
-                                cgpoints[i] = transform.TransformPoint(points[i].ToPointF());
-
-                            pathData.Data.AddLines(cgpoints);
-
-                            lastPoint = points.Count > 0 ? points[points.Count - 1] : Point.Zero;
-                        }
-                    }
-
-                    if (pathFigure.IsClosed)
-                        pathData.Data.CloseSubpath();
-                }
-            }
-
-            return pathData;
-        }
-    }
+	public static class GeometryExtensions
+	{
+		public static PathData ToCGPath(this Geometry geometry, Transform renderTransform = null)
+		{
+			PathData pathData = new PathData
+			{
+				Data = new CGPath()
+			};
+
+			CGAffineTransform transform;
+
+			if (renderTransform == null)
+				transform = CGAffineTransform.MakeIdentity();
+			else
+				transform = renderTransform.ToCGAffineTransform();
+
+			if (geometry is LineGeometry)
+			{
+				LineGeometry lineGeometry = geometry as LineGeometry;
+				pathData.Data.MoveToPoint(transform, lineGeometry.StartPoint.ToPointF());
+				pathData.Data.AddLineToPoint(transform, lineGeometry.EndPoint.ToPointF());
+			}
+			else if (geometry is RectangleGeometry)
+			{
+				var rect = (geometry as RectangleGeometry).Rect;
+				pathData.Data.AddRect(transform, new CGRect(rect.X, rect.Y, rect.Width, rect.Height));
+			}
+			else if (geometry is EllipseGeometry)
+			{
+				EllipseGeometry ellipseGeometry = geometry as EllipseGeometry;
+
+				CGRect rect = new CGRect(
+					ellipseGeometry.Center.X - ellipseGeometry.RadiusX,
+					ellipseGeometry.Center.Y - ellipseGeometry.RadiusY,
+					ellipseGeometry.RadiusX * 2,
+					ellipseGeometry.RadiusY * 2);
+
+				pathData.Data.AddEllipseInRect(transform, rect);
+			}
+			else if (geometry is GeometryGroup)
+			{
+				GeometryGroup geometryGroup = geometry as GeometryGroup;
+
+				pathData.IsNonzeroFillRule = geometryGroup.FillRule == FillRule.Nonzero;
+
+				foreach (Geometry child in geometryGroup.Children)
+				{
+					PathData pathChild = child.ToCGPath(renderTransform);
+					pathData.Data.AddPath(pathChild.Data);
+				}
+			}
+			else if (geometry is PathGeometry)
+			{
+				PathGeometry pathGeometry = geometry as PathGeometry;
+
+				pathData.IsNonzeroFillRule = pathGeometry.FillRule == FillRule.Nonzero;
+
+				foreach (PathFigure pathFigure in pathGeometry.Figures)
+				{
+					pathData.Data.MoveToPoint(transform, pathFigure.StartPoint.ToPointF());
+					Point lastPoint = pathFigure.StartPoint;
+
+					foreach (PathSegment pathSegment in pathFigure.Segments)
+					{
+						// LineSegment
+						if (pathSegment is LineSegment)
+						{
+							LineSegment lineSegment = pathSegment as LineSegment;
+
+							pathData.Data.AddLineToPoint(transform, lineSegment.Point.ToPointF());
+							lastPoint = lineSegment.Point;
+						}
+						// PolyLineSegment
+						else if (pathSegment is PolyLineSegment)
+						{
+							PolyLineSegment polylineSegment = pathSegment as PolyLineSegment;
+							PointCollection points = polylineSegment.Points;
+
+							for (int i = 0; i < points.Count; i++)
+								pathData.Data.AddLineToPoint(transform, points[i].ToPointF());
+
+							lastPoint = points[points.Count - 1];
+						}
+
+						// BezierSegment
+						if (pathSegment is BezierSegment)
+						{
+							BezierSegment bezierSegment = pathSegment as BezierSegment;
+
+							pathData.Data.AddCurveToPoint(
+								transform,
+								bezierSegment.Point1.ToPointF(),
+								bezierSegment.Point2.ToPointF(),
+								bezierSegment.Point3.ToPointF());
+
+							lastPoint = bezierSegment.Point3;
+						}
+						// PolyBezierSegment
+						else if (pathSegment is PolyBezierSegment)
+						{
+							PolyBezierSegment polyBezierSegment = pathSegment as PolyBezierSegment;
+							PointCollection points = polyBezierSegment.Points;
+
+							if (points.Count >= 3)
+							{
+								for (int i = 0; i < points.Count; i += 3)
+								{
+									pathData.Data.AddCurveToPoint(
+										transform,
+										points[i].ToPointF(),
+										points[i + 1].ToPointF(),
+										points[i + 2].ToPointF());
+								}
+							}
+
+							lastPoint = points[points.Count - 1];
+						}
+
+						// QuadraticBezierSegment
+						if (pathSegment is QuadraticBezierSegment)
+						{
+							QuadraticBezierSegment bezierSegment = pathSegment as QuadraticBezierSegment;
+
+							pathData.Data.AddQuadCurveToPoint(
+								transform,
+								new nfloat(bezierSegment.Point1.X),
+								new nfloat(bezierSegment.Point1.Y),
+								new nfloat(bezierSegment.Point2.X),
+								new nfloat(bezierSegment.Point2.Y));
+
+							lastPoint = bezierSegment.Point2;
+						}
+						// PolyQuadraticBezierSegment
+						else if (pathSegment is PolyQuadraticBezierSegment)
+						{
+							PolyQuadraticBezierSegment polyBezierSegment = pathSegment as PolyQuadraticBezierSegment;
+							PointCollection points = polyBezierSegment.Points;
+
+							if (points.Count >= 2)
+							{
+								for (int i = 0; i < points.Count; i += 2)
+								{
+									pathData.Data.AddQuadCurveToPoint(
+										transform,
+										new nfloat(points[i + 0].X),
+										new nfloat(points[i + 0].Y),
+										new nfloat(points[i + 1].X),
+										new nfloat(points[i + 1].Y));
+								}
+							}
+
+							lastPoint = points[points.Count - 1];
+						}
+						// ArcSegment
+						else if (pathSegment is ArcSegment)
+						{
+							ArcSegment arcSegment = pathSegment as ArcSegment;
+
+							List<Point> points = new List<Point>();
+
+							GeometryHelper.FlattenArc(
+								points,
+								lastPoint,
+								arcSegment.Point,
+								arcSegment.Size.Width,
+								arcSegment.Size.Height,
+								arcSegment.RotationAngle,
+								arcSegment.IsLargeArc,
+								arcSegment.SweepDirection == SweepDirection.CounterClockwise,
+								1);
+
+							CGPoint[] cgpoints = new CGPoint[points.Count];
+
+							for (int i = 0; i < points.Count; i++)
+								cgpoints[i] = transform.TransformPoint(points[i].ToPointF());
+
+							pathData.Data.AddLines(cgpoints);
+
+							lastPoint = points.Count > 0 ? points[points.Count - 1] : Point.Zero;
+						}
+					}
+
+					if (pathFigure.IsClosed)
+						pathData.Data.CloseSubpath();
+				}
+			}
+
+			return pathData;
+		}
+	}
 }
\ No newline at end of file
diff --git a/src/Compatibility/Core/src/iOS/Extensions/PointCollectionExtensions.cs b/src/Compatibility/Core/src/iOS/Extensions/PointCollectionExtensions.cs
index 5c0012030305..294ca27da656 100644
--- a/src/Compatibility/Core/src/iOS/Extensions/PointCollectionExtensions.cs
+++ b/src/Compatibility/Core/src/iOS/Extensions/PointCollectionExtensions.cs
@@ -8,25 +8,25 @@ namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 namespace Microsoft.Maui.Controls.Compatibility.Platform.MacOS
 #endif
 {
-    public static class PointCollectionExtensions
-    {
-        public static CGPoint[] ToCGPoints(this PointCollection pointCollection)
-        {
-            if (pointCollection == null || pointCollection.Count == 0)
-            {
-                return new CGPoint[0];
-            }
+	public static class PointCollectionExtensions
+	{
+		public static CGPoint[] ToCGPoints(this PointCollection pointCollection)
+		{
+			if (pointCollection == null || pointCollection.Count == 0)
+			{
+				return new CGPoint[0];
+			}
 
-            CGPoint[] points = new CGPoint[pointCollection.Count];
-            Point[] array = new Point[pointCollection.Count];
-            pointCollection.CopyTo(array, 0);
+			CGPoint[] points = new CGPoint[pointCollection.Count];
+			Point[] array = new Point[pointCollection.Count];
+			pointCollection.CopyTo(array, 0);
 
-            for (int i = 0; i < array.Length; i++)
-            {
-                points[i] = new CGPoint(array[i].X, array[i].Y);
-            }
+			for (int i = 0; i < array.Length; i++)
+			{
+				points[i] = new CGPoint(array[i].X, array[i].Y);
+			}
 
-            return points;
-        }
-    }
+			return points;
+		}
+	}
 }
\ No newline at end of file
diff --git a/src/Compatibility/Core/src/iOS/Extensions/TransformExtensions.cs b/src/Compatibility/Core/src/iOS/Extensions/TransformExtensions.cs
index a55ec0ef352a..12a8fa1eafc4 100644
--- a/src/Compatibility/Core/src/iOS/Extensions/TransformExtensions.cs
+++ b/src/Compatibility/Core/src/iOS/Extensions/TransformExtensions.cs
@@ -8,22 +8,22 @@ namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 namespace Microsoft.Maui.Controls.Compatibility.Platform.MacOS
 #endif
 {
-    public static class TransformExtensions
+	public static class TransformExtensions
 	{
-        public static CGAffineTransform ToCGAffineTransform(this Transform transform)
-        {
-            if (transform == null)
-                return CGAffineTransform.MakeIdentity();
+		public static CGAffineTransform ToCGAffineTransform(this Transform transform)
+		{
+			if (transform == null)
+				return CGAffineTransform.MakeIdentity();
 
-            Matrix matrix = transform.Value;
+			Matrix matrix = transform.Value;
 
-            return new CGAffineTransform(
+			return new CGAffineTransform(
 				new nfloat(matrix.M11),
-                new nfloat(matrix.M12),
-                new nfloat(matrix.M21),
-                new nfloat(matrix.M22),
-                new nfloat(matrix.OffsetX),
-                new nfloat(matrix.OffsetY));
-        }
-    }
+				new nfloat(matrix.M12),
+				new nfloat(matrix.M21),
+				new nfloat(matrix.M22),
+				new nfloat(matrix.OffsetX),
+				new nfloat(matrix.OffsetY));
+		}
+	}
 }
\ No newline at end of file
diff --git a/src/Compatibility/Core/src/iOS/Forms.cs b/src/Compatibility/Core/src/iOS/Forms.cs
index d4e8580d6564..c2a2831d8fd1 100644
--- a/src/Compatibility/Core/src/iOS/Forms.cs
+++ b/src/Compatibility/Core/src/iOS/Forms.cs
@@ -39,11 +39,6 @@ public static class Forms
 
 		public static bool IsInitialized { get; private set; }
 
-		static IFontManager s_fontManager;
-
-		internal static IFontManager FontManager =>
-			s_fontManager ??= new FontManager(Microsoft.Maui.Controls.Internals.Registrar.FontRegistrar);
-
 #if __MOBILE__
 		static bool? s_isiOS9OrNewer;
 		static bool? s_isiOS10OrNewer;
@@ -202,7 +197,7 @@ static void SetupInit(IMauiContext context, InitializationOptions? maybeOptions
 				// Only need to do this once
 				Log.Listeners.Add(new DelegateLogListener((c, m) => Trace.WriteLine(m, c)));
 			}
-			
+
 #if __MOBILE__
 			Device.SetIdiom(UIDevice.CurrentDevice.UserInterfaceIdiom == UIUserInterfaceIdiom.Pad ? TargetIdiom.Tablet : TargetIdiom.Phone);
 			Device.SetFlowDirection(UIApplication.SharedApplication.UserInterfaceLayoutDirection.ToFlowDirection());
diff --git a/src/Compatibility/Core/src/iOS/HandlerToRendererShim.cs b/src/Compatibility/Core/src/iOS/HandlerToRendererShim.cs
index fe554306502f..a50d9551b8a5 100644
--- a/src/Compatibility/Core/src/iOS/HandlerToRendererShim.cs
+++ b/src/Compatibility/Core/src/iOS/HandlerToRendererShim.cs
@@ -1,9 +1,8 @@
 using System;
 using System.ComponentModel;
-using UIKit;
-using Microsoft.Maui.Controls.Compatibility.Internals;
 using Microsoft.Maui.Controls.Internals;
 using Microsoft.Maui.Graphics;
+using UIKit;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {
@@ -55,7 +54,7 @@ public void SetElement(VisualElement element)
 
 		void OnBatchCommitted(object sender, EventArg<VisualElement> e)
 		{
-			ViewHandler?.SetFrame(Element.Bounds);
+			ViewHandler?.NativeArrange(Element.Bounds);
 		}
 
 		void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
diff --git a/src/Compatibility/Core/src/iOS/IOSDeviceInfo.cs b/src/Compatibility/Core/src/iOS/IOSDeviceInfo.cs
index eb69c7c298bd..9f23772723c9 100644
--- a/src/Compatibility/Core/src/iOS/IOSDeviceInfo.cs
+++ b/src/Compatibility/Core/src/iOS/IOSDeviceInfo.cs
@@ -1,10 +1,8 @@
 using System;
-
 using Foundation;
-using UIKit;
-using Microsoft.Maui.Controls.Compatibility.Internals;
 using Microsoft.Maui.Controls.Internals;
 using Microsoft.Maui.Graphics;
+using UIKit;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {
diff --git a/src/Compatibility/Core/src/iOS/LinkerSafeAttribute.cs b/src/Compatibility/Core/src/iOS/LinkerSafeAttribute.cs
deleted file mode 100644
index dcddc14a6a09..000000000000
--- a/src/Compatibility/Core/src/iOS/LinkerSafeAttribute.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.ComponentModel;
-
-namespace Microsoft.Maui.Controls.Compatibility.Internals
-{
-	[AttributeUsage(AttributeTargets.All)]
-	[EditorBrowsable(EditorBrowsableState.Never)]
-	class LinkerSafeAttribute : Attribute
-	{
-		public LinkerSafeAttribute()
-		{
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Compatibility/Core/src/iOS/ModalWrapper.cs b/src/Compatibility/Core/src/iOS/ModalWrapper.cs
index 74a168ae4ef4..daf3b19c96b1 100644
--- a/src/Compatibility/Core/src/iOS/ModalWrapper.cs
+++ b/src/Compatibility/Core/src/iOS/ModalWrapper.cs
@@ -1,11 +1,11 @@
 using System;
+using System.ComponentModel;
 using System.Linq;
-using UIKit;
-using Foundation;
 using System.Threading.Tasks;
-using System.ComponentModel;
+using Foundation;
 using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
 using Microsoft.Maui.Graphics;
+using UIKit;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {
diff --git a/src/Compatibility/Core/src/iOS/NativeBindingService.cs b/src/Compatibility/Core/src/iOS/NativeBindingService.cs
index 9e497e34b427..f51ced5b5582 100644
--- a/src/Compatibility/Core/src/iOS/NativeBindingService.cs
+++ b/src/Compatibility/Core/src/iOS/NativeBindingService.cs
@@ -1,8 +1,6 @@
-using System;
-using UIKit;
-using Microsoft.Maui.Controls.Compatibility.Internals;
-using Microsoft.Maui.Controls.Xaml.Internals;
 using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Controls.Xaml.Internals;
+using UIKit;
 
 [assembly: Microsoft.Maui.Controls.Dependency(typeof(Microsoft.Maui.Controls.Compatibility.Platform.iOS.NativeBindingService))]
 
diff --git a/src/Compatibility/Core/src/iOS/NativeValueConverterService.cs b/src/Compatibility/Core/src/iOS/NativeValueConverterService.cs
index 9f014f42ecd3..b8d67fde9554 100644
--- a/src/Compatibility/Core/src/iOS/NativeValueConverterService.cs
+++ b/src/Compatibility/Core/src/iOS/NativeValueConverterService.cs
@@ -1,5 +1,4 @@
 using System;
-using Microsoft.Maui.Controls.Compatibility.Internals;
 using Microsoft.Maui.Controls.Internals;
 using Microsoft.Maui.Controls.Xaml.Internals;
 #if __MOBILE__
diff --git a/src/Compatibility/Core/src/iOS/Platform.cs b/src/Compatibility/Core/src/iOS/Platform.cs
index cbc048b7243c..6b4e33cd8ebf 100644
--- a/src/Compatibility/Core/src/iOS/Platform.cs
+++ b/src/Compatibility/Core/src/iOS/Platform.cs
@@ -4,13 +4,13 @@
 using System.Threading.Tasks;
 using CoreGraphics;
 using Foundation;
-using UIKit;
-using IOPath = System.IO.Path;
-using CGRect = CoreGraphics.CGRect;
 using Microsoft.Maui.Controls.Internals;
 using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
 using Microsoft.Maui.Graphics;
 using Microsoft.Maui.Platform.iOS;
+using UIKit;
+using CGRect = CoreGraphics.CGRect;
+using IOPath = System.IO.Path;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {
diff --git a/src/Compatibility/Core/src/iOS/Properties/AssemblyInfo.cs b/src/Compatibility/Core/src/iOS/Properties/AssemblyInfo.cs
index cd830a1c9ba2..ed43db832d90 100644
--- a/src/Compatibility/Core/src/iOS/Properties/AssemblyInfo.cs
+++ b/src/Compatibility/Core/src/iOS/Properties/AssemblyInfo.cs
@@ -1,10 +1,10 @@
+using System.Reflection;
 using System.Runtime.CompilerServices;
+using Microsoft.Maui.Controls;
 using Microsoft.Maui.Controls.Compatibility;
-using Microsoft.Maui.Controls.Compatibility.Internals;
 using Microsoft.Maui.Controls.Compatibility.Platform.iOS;
-using UIKit;
 using Microsoft.Maui.Controls.Shapes;
-using Microsoft.Maui.Controls;
+using UIKit;
 
 [assembly: ExportRenderer(typeof(BoxView), typeof(BoxRenderer))]
 [assembly: ExportRenderer(typeof(Entry), typeof(EntryRenderer))]
@@ -27,11 +27,11 @@
 [assembly: ExportRenderer(typeof(ActivityIndicator), typeof(ActivityIndicatorRenderer))]
 [assembly: ExportRenderer(typeof(Frame), typeof(FrameRenderer))]
 [assembly: ExportRenderer(typeof(ListView), typeof(ListViewRenderer))]
-[assembly: ExportRenderer (typeof (CollectionView), typeof (CollectionViewRenderer))]
+[assembly: ExportRenderer(typeof(CollectionView), typeof(CollectionViewRenderer))]
 [assembly: ExportRenderer(typeof(CarouselView), typeof(CarouselViewRenderer))]
 [assembly: ExportRenderer(typeof(IndicatorView), typeof(IndicatorViewRenderer))]
 [assembly: ExportRenderer(typeof(OpenGLView), typeof(OpenGLViewRenderer))]
-[assembly: ExportRenderer (typeof (CheckBox), typeof (CheckBoxRenderer))]
+[assembly: ExportRenderer(typeof(CheckBox), typeof(CheckBoxRenderer))]
 [assembly: ExportRenderer(typeof(Path), typeof(PathRenderer))]
 [assembly: ExportRenderer(typeof(Ellipse), typeof(EllipseRenderer))]
 [assembly: ExportRenderer(typeof(Line), typeof(LineRenderer))]
@@ -74,4 +74,4 @@
 [assembly: Microsoft.Maui.Controls.Dependency(typeof(Deserializer))]
 [assembly: Microsoft.Maui.Controls.Dependency(typeof(ResourcesProvider))]
 [assembly: ResolutionGroupName("Xamarin")]
-[assembly: LinkerSafe]
\ No newline at end of file
+[assembly: AssemblyMetadata("IsTrimmable", "True")]
\ No newline at end of file
diff --git a/src/Compatibility/Core/src/iOS/RendererPool.cs b/src/Compatibility/Core/src/iOS/RendererPool.cs
index a40f5b9f2bea..7dd2f0e9e48c 100644
--- a/src/Compatibility/Core/src/iOS/RendererPool.cs
+++ b/src/Compatibility/Core/src/iOS/RendererPool.cs
@@ -110,10 +110,13 @@ void FillChildrenWithRenderers(VisualElement element)
 				var child = logicalChild as VisualElement;
 				if (child != null)
 				{
-					if (CompressedLayout.GetIsHeadless(child)) {
+					if (CompressedLayout.GetIsHeadless(child))
+					{
 						child.IsPlatformEnabled = true;
 						FillChildrenWithRenderers(child);
-					} else {
+					}
+					else
+					{
 						var renderer = GetFreeRenderer(child) ?? Platform.CreateRenderer(child);
 						Platform.SetRenderer(child, renderer);
 						_parent.NativeView.AddSubview(renderer.NativeView);
diff --git a/src/Compatibility/Core/src/iOS/RendererToHandlerShim.cs b/src/Compatibility/Core/src/iOS/RendererToHandlerShim.cs
index 886899c0c6f2..23a38b19a0f9 100644
--- a/src/Compatibility/Core/src/iOS/RendererToHandlerShim.cs
+++ b/src/Compatibility/Core/src/iOS/RendererToHandlerShim.cs
@@ -1,8 +1,7 @@
 using System;
-using ViewHandler = Microsoft.Maui.Handlers.ViewHandler<Microsoft.Maui.IView, UIKit.UIView>;
-using UIKit;
 using Microsoft.Maui.Controls.Compatibility.Platform.iOS;
-using Microsoft.Maui.Handlers;
+using UIKit;
+using ViewHandler = Microsoft.Maui.Handlers.ViewHandler<Microsoft.Maui.IView, UIKit.UIView>;
 
 namespace Microsoft.Maui.Controls.Compatibility
 {
@@ -21,7 +20,7 @@ public static IViewHandler CreateShim(object renderer)
 			return new RendererToHandlerShim();
 		}
 
-		public RendererToHandlerShim() : base(Handlers.ViewHandler.ViewMapper)
+		public RendererToHandlerShim() : base(ViewHandler.ViewMapper)
 		{
 		}
 
@@ -111,7 +110,7 @@ public override void UpdateValue(string property)
 			base.UpdateValue(property);
 			if (property == "Frame")
 			{
-				SetFrame(VisualElementRenderer.Element.Bounds);
+				NativeArrange(VisualElementRenderer.Element.Bounds);
 			}
 		}
 	}
diff --git a/src/Compatibility/Core/src/iOS/Renderers/ActivityIndicatorRenderer.cs b/src/Compatibility/Core/src/iOS/Renderers/ActivityIndicatorRenderer.cs
index 6542957689b2..9a988c6786ef 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/ActivityIndicatorRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/ActivityIndicatorRenderer.cs
@@ -1,38 +1,38 @@
-using CoreGraphics;
-using System.ComponentModel;
+using System.ComponentModel;
 using System.Drawing;
+using CoreGraphics;
 using UIKit;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {
 	[PortHandler]
 	public sealed class UIActivityIndicatorViewDelegate : UIActivityIndicatorView
-    {
-        ActivityIndicator _element;
-        public UIActivityIndicatorViewDelegate(RectangleF point, ActivityIndicator element) : base(point)
-            => _element = element;
+	{
+		ActivityIndicator _element;
+		public UIActivityIndicatorViewDelegate(RectangleF point, ActivityIndicator element) : base(point)
+			=> _element = element;
 
-        public override void Draw(CGRect rect)
-        {
-            base.Draw(rect);
-            if (_element?.IsRunning == true)
-                StartAnimating();
-        }
+		public override void Draw(CGRect rect)
+		{
+			base.Draw(rect);
+			if (_element?.IsRunning == true)
+				StartAnimating();
+		}
+
+		public override void LayoutSubviews()
+		{
+			base.LayoutSubviews();
+			if (_element?.IsRunning == true)
+				StartAnimating();
+		}
 
-        public override void LayoutSubviews()
-        {
-            base.LayoutSubviews();
-            if (_element?.IsRunning == true)
-                StartAnimating();
-        }
+		protected override void Dispose(bool disposing)
+		{
+			base.Dispose(disposing);
+			_element = null;
+		}
+	}
 
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-            _element = null;
-        }
-    }
-	
 	public class ActivityIndicatorRenderer : ViewRenderer<ActivityIndicator, UIActivityIndicatorView>
 	{
 		[Microsoft.Maui.Controls.Internals.Preserve(Conditional = true)]
@@ -48,7 +48,7 @@ protected override void OnElementChanged(ElementChangedEventArgs<ActivityIndicat
 			{
 				if (Control == null)
 				{
-					if(Forms.IsiOS13OrNewer)
+					if (Forms.IsiOS13OrNewer)
 						SetNativeControl(new UIActivityIndicatorViewDelegate(RectangleF.Empty, e.NewElement) { ActivityIndicatorViewStyle = UIActivityIndicatorViewStyle.Medium });
 					else
 						SetNativeControl(new UIActivityIndicatorViewDelegate(RectangleF.Empty, e.NewElement) { ActivityIndicatorViewStyle = UIActivityIndicatorViewStyle.Gray });
@@ -81,8 +81,8 @@ void UpdateColor()
 		void UpdateIsRunning()
 		{
 			if (Control?.Superview == null)
-                return;
-				
+				return;
+
 			if (Element.IsRunning)
 				Control.StartAnimating();
 			else
diff --git a/src/Compatibility/Core/src/iOS/Renderers/BoxRenderer.cs b/src/Compatibility/Core/src/iOS/Renderers/BoxRenderer.cs
index b6402fe28cdd..1f624e003407 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/BoxRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/BoxRenderer.cs
@@ -1,5 +1,6 @@
 using System;
 using System.ComponentModel;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
 using UIKit;
 using RectangleF = CoreGraphics.CGRect;
@@ -29,15 +30,18 @@ public BoxRenderer()
 
 		public override void Draw(RectangleF rect)
 		{
-			UIBezierPath bezierPath = new UIBezierPath();
+			if (_colorToRenderer != null)
+			{
+				UIBezierPath bezierPath = new UIBezierPath();
 
-			bezierPath.AddArc(new CoreGraphics.CGPoint(Bounds.X + Bounds.Width - _topRight, Bounds.Y + _topRight), _topRight, PIAndAHalf, TwoPI, true);
-			bezierPath.AddArc(new CoreGraphics.CGPoint(Bounds.X + Bounds.Width - _bottomRight, Bounds.Y + Bounds.Height - _bottomRight), _bottomRight, 0, HalfPI, true);
-			bezierPath.AddArc(new CoreGraphics.CGPoint(Bounds.X + _bottomLeft, Bounds.Y + Bounds.Height - _bottomLeft), _bottomLeft, HalfPI, PI, true);
-			bezierPath.AddArc(new CoreGraphics.CGPoint(Bounds.X + _topLeft, Bounds.Y + _topLeft), _topLeft, PI, PIAndAHalf, true);
+				bezierPath.AddArc(new CoreGraphics.CGPoint(Bounds.X + Bounds.Width - _topRight, Bounds.Y + _topRight), _topRight, PIAndAHalf, TwoPI, true);
+				bezierPath.AddArc(new CoreGraphics.CGPoint(Bounds.X + Bounds.Width - _bottomRight, Bounds.Y + Bounds.Height - _bottomRight), _bottomRight, 0, HalfPI, true);
+				bezierPath.AddArc(new CoreGraphics.CGPoint(Bounds.X + _bottomLeft, Bounds.Y + Bounds.Height - _bottomLeft), _bottomLeft, HalfPI, PI, true);
+				bezierPath.AddArc(new CoreGraphics.CGPoint(Bounds.X + _topLeft, Bounds.Y + _topLeft), _topLeft, PI, PIAndAHalf, true);
 
-			_colorToRenderer.SetFill();
-			bezierPath.Fill();
+				_colorToRenderer.SetFill();
+				bezierPath.Fill();
+			}
 
 			base.Draw(rect);
 
diff --git a/src/Compatibility/Core/src/iOS/Renderers/ButtonLayoutManager.cs b/src/Compatibility/Core/src/iOS/Renderers/ButtonLayoutManager.cs
index 4eb18ccb359a..1ea41401a695 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/ButtonLayoutManager.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/ButtonLayoutManager.cs
@@ -108,7 +108,8 @@ void UpdateLineBreakMode()
 			if (_disposed || _renderer == null || _element == null || control == null)
 				return;
 
-			control.TitleLabel.LineBreakMode = _element.LineBreakMode switch {
+			control.TitleLabel.LineBreakMode = _element.LineBreakMode switch
+			{
 				LineBreakMode.NoWrap => UILineBreakMode.Clip,
 				LineBreakMode.WordWrap => UILineBreakMode.WordWrap,
 				LineBreakMode.CharacterWrap => UILineBreakMode.CharacterWrap,
diff --git a/src/Compatibility/Core/src/iOS/Renderers/ButtonRenderer.cs b/src/Compatibility/Core/src/iOS/Renderers/ButtonRenderer.cs
index 5b7fca4f4397..326f568cfdfb 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/ButtonRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/ButtonRenderer.cs
@@ -1,10 +1,11 @@
 using System;
 using System.ComponentModel;
 using System.Diagnostics;
+using CoreGraphics;
+using Microsoft.Maui.Controls.Platform;
 using UIKit;
-using SizeF = CoreGraphics.CGSize;
 using PreserveAttribute = Foundation.PreserveAttribute;
-using CoreGraphics;
+using SizeF = CoreGraphics.CGSize;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {
diff --git a/src/Compatibility/Core/src/iOS/Renderers/CarouselPageRenderer.cs b/src/Compatibility/Core/src/iOS/Renderers/CarouselPageRenderer.cs
index a5a7d8208cd0..b1690e87e807 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/CarouselPageRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/CarouselPageRenderer.cs
@@ -2,13 +2,13 @@
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.ComponentModel;
+using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Controls.Platform;
+using Microsoft.Maui.Graphics;
 using UIKit;
-using Microsoft.Maui.Controls.Compatibility.Internals;
 using PointF = CoreGraphics.CGPoint;
 using RectangleF = CoreGraphics.CGRect;
 using SizeF = CoreGraphics.CGSize;
-using Microsoft.Maui.Controls.Internals;
-using Microsoft.Maui.Graphics;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {
@@ -271,7 +271,7 @@ void OnDecelerationEnded(object sender, EventArgs eventArgs)
 		{
 			if (_ignoreNativeScrolling || SelectedIndex >= ElementController.LogicalChildren.Count)
 				return;
-						
+
 			var currentPage = (ContentPage)ElementController.LogicalChildren[SelectedIndex];
 			if (_previousPage != currentPage)
 			{
diff --git a/src/Compatibility/Core/src/iOS/Renderers/CheckBoxRenderer.cs b/src/Compatibility/Core/src/iOS/Renderers/CheckBoxRenderer.cs
index 5774f01a2d13..7c6d2bd813fa 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/CheckBoxRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/CheckBoxRenderer.cs
@@ -11,10 +11,10 @@ public CheckBoxRenderer()
 		}
 
 
-        protected override FormsCheckBox CreateNativeControl()
-        {
-            return new FormsCheckBox();
-        }
+		protected override FormsCheckBox CreateNativeControl()
+		{
+			return new FormsCheckBox();
+		}
 
-    }
+	}
 }
diff --git a/src/Compatibility/Core/src/iOS/Renderers/CheckBoxRendererBase.cs b/src/Compatibility/Core/src/iOS/Renderers/CheckBoxRendererBase.cs
index 682d8ed7be57..ae3e9561ccbe 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/CheckBoxRendererBase.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/CheckBoxRendererBase.cs
@@ -89,7 +89,7 @@ protected override void Dispose(bool disposing)
 				return;
 
 			_disposed = true;
-			
+
 			if (disposing && Control != null)
 			{
 				Control.CheckedChanged -= OnControlCheckedChanged;
diff --git a/src/Compatibility/Core/src/iOS/Renderers/EditorRenderer.cs b/src/Compatibility/Core/src/iOS/Renderers/EditorRenderer.cs
index 8f20416ac133..453e2689ac33 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/EditorRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/EditorRenderer.cs
@@ -2,9 +2,9 @@
 using System.ComponentModel;
 using CoreGraphics;
 using Foundation;
+using Microsoft.Maui.Graphics;
 using Microsoft.Maui.Platform.iOS;
 using UIKit;
-using Microsoft.Maui.Graphics;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {
@@ -77,12 +77,12 @@ protected internal override void UpdateCharacterSpacing()
 		{
 			var textAttr = TextView.AttributedText.WithCharacterSpacing(Element.CharacterSpacing);
 
-			if(textAttr != null)
+			if (textAttr != null)
 				TextView.AttributedText = textAttr;
 
 			var placeHolder = _placeholderLabel.AttributedText.WithCharacterSpacing(Element.CharacterSpacing);
 
-			if(placeHolder != null)
+			if (placeHolder != null)
 				_placeholderLabel.AttributedText = placeHolder;
 		}
 
@@ -152,7 +152,7 @@ protected override void Dispose(bool disposing)
 					TextView.Started -= OnStarted;
 					TextView.Ended -= OnEnded;
 					TextView.ShouldChangeText -= ShouldChangeText;
-					if(Control is IFormsUITextView formsUITextView)
+					if (Control is IFormsUITextView formsUITextView)
 						formsUITextView.FrameChanged -= OnFrameChanged;
 				}
 			}
@@ -278,6 +278,7 @@ private void OnFrameChanged(object sender, EventArgs e)
 			}
 		}
 
+		[PortHandler("Missing to port the code related with Focus")]
 		void OnEnded(object sender, EventArgs eventArgs)
 		{
 			if (TextView.Text != Element.Text)
diff --git a/src/Compatibility/Core/src/iOS/Renderers/EntryRenderer.cs b/src/Compatibility/Core/src/iOS/Renderers/EntryRenderer.cs
index d16418ef7e42..4a7b23cf9cd7 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/EntryRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/EntryRenderer.cs
@@ -1,12 +1,12 @@
 using System;
 using System.ComponentModel;
-using Microsoft.Maui.Graphics;
 using CoreGraphics;
 using Foundation;
-using UIKit;
 using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
-using Specifics = Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific.Entry;
+using Microsoft.Maui.Graphics;
 using Microsoft.Maui.Platform.iOS;
+using UIKit;
+using Specifics = Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific.Entry;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {
@@ -244,6 +244,7 @@ void OnEditingEnded(object sender, EventArgs e)
 			ElementController.SetValueFromRenderer(VisualElement.IsFocusedPropertyKey, false);
 		}
 
+		[PortHandler("Still pending the code related to Focus.")]
 		protected virtual bool OnShouldReturn(UITextField view)
 		{
 			Control.ResignFirstResponder();
@@ -375,7 +376,7 @@ void UpdateText()
 				Control.Text = text;
 		}
 
-		[PortHandler ("Partially ported ...")]
+		[PortHandler("Partially ported ...")]
 		void UpdateCharacterSpacing()
 		{
 			var textAttr = Control.AttributedText.WithCharacterSpacing(Element.CharacterSpacing);
diff --git a/src/Compatibility/Core/src/iOS/Renderers/FormsCheckBox.cs b/src/Compatibility/Core/src/iOS/Renderers/FormsCheckBox.cs
index 0029380fe0ee..4033d43b9da5 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/FormsCheckBox.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/FormsCheckBox.cs
@@ -14,7 +14,7 @@ public class FormsCheckBox : UIButton
 		// all these values were chosen to just match the android drawables that are used
 		const float _defaultSize = 18.0f;
 		const float _lineWidth = 2.0f;
-		Color  _tintColor;
+		Color _tintColor;
 		bool _isChecked;
 		bool _isEnabled;
 		float _minimumViewSize;
@@ -124,7 +124,7 @@ public override bool Enabled
 				bool changed = base.Enabled != value;
 				base.Enabled = value;
 
-				if(changed)
+				if (changed)
 					UpdateDisplay();
 			}
 		}
@@ -235,7 +235,7 @@ protected override void Dispose(bool disposing)
 				return;
 
 			_disposed = true;
-			if(disposing)
+			if (disposing)
 				TouchUpInside -= OnTouchUpInside;
 
 			base.Dispose(disposing);
diff --git a/src/Compatibility/Core/src/iOS/Renderers/FrameRenderer.cs b/src/Compatibility/Core/src/iOS/Renderers/FrameRenderer.cs
index 1506b02b8e99..ede72b4d6292 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/FrameRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/FrameRenderer.cs
@@ -1,6 +1,7 @@
 using System.ComponentModel;
 using System.Drawing;
 using CoreGraphics;
+using Microsoft.Maui.Controls.Platform;
 using UIKit;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
@@ -61,7 +62,7 @@ public override void TraitCollectionDidChange(UITraitCollection previousTraitCol
 		}
 
 		public virtual void SetupLayer()
-		{			
+		{
 			if (_actualView == null)
 				return;
 
@@ -184,7 +185,7 @@ public override void RemoveFromSuperview()
 
 			public override bool PointInside(CGPoint point, UIEvent uievent)
 			{
-				foreach(var view in Subviews)
+				foreach (var view in Subviews)
 				{
 					if (view.HitTest(ConvertPointToView(point, view), uievent) != null)
 						return true;
diff --git a/src/Compatibility/Core/src/iOS/Renderers/IAccessibilityElementsController.cs b/src/Compatibility/Core/src/iOS/Renderers/IAccessibilityElementsController.cs
index a05c38ecd6bd..a0765f7641ab 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/IAccessibilityElementsController.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/IAccessibilityElementsController.cs
@@ -1,6 +1,6 @@
-using Foundation;
 using System;
 using System.Collections.Generic;
+using Foundation;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {
diff --git a/src/Compatibility/Core/src/iOS/Renderers/IImageVisualElementRenderer.cs b/src/Compatibility/Core/src/iOS/Renderers/IImageVisualElementRenderer.cs
index f97dcb8aa636..d7a7d85928ba 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/IImageVisualElementRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/IImageVisualElementRenderer.cs
@@ -1,6 +1,6 @@
 #if __MOBILE__
-using NativeImageView = UIKit.UIImageView;
 using NativeImage = UIKit.UIImage;
+using NativeImageView = UIKit.UIImageView;
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 #else
 using NativeImageView = AppKit.NSImageView;
diff --git a/src/Compatibility/Core/src/iOS/Renderers/IShellFlyoutTransition.cs b/src/Compatibility/Core/src/iOS/Renderers/IShellFlyoutTransition.cs
index 42c6936b85be..ade25410baad 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/IShellFlyoutTransition.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/IShellFlyoutTransition.cs
@@ -1,5 +1,5 @@
-using CoreGraphics;
 using System;
+using CoreGraphics;
 using UIKit;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
diff --git a/src/Compatibility/Core/src/iOS/Renderers/ImageAnimationHelper.cs b/src/Compatibility/Core/src/iOS/Renderers/ImageAnimationHelper.cs
index e1cfcaa92b75..c8309ab15681 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/ImageAnimationHelper.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/ImageAnimationHelper.cs
@@ -208,9 +208,9 @@ static public FormsCAKeyFrameAnimation CreateAnimationFromCGImageSource(CGImageS
 		{
 			FormsCAKeyFrameAnimation animation = null;
 
-			if (imageSource?.Uri != null)
+			if (imageSource is IStreamImageSource streamImageSource)
 			{
-				using (var streamImage = await imageSource.GetStreamAsync(cancelationToken).ConfigureAwait(false))
+				using (var streamImage = await streamImageSource.GetStreamAsync(cancelationToken).ConfigureAwait(false))
 				{
 					if (streamImage != null)
 					{
diff --git a/src/Compatibility/Core/src/iOS/Renderers/ImageButtonRenderer.cs b/src/Compatibility/Core/src/iOS/Renderers/ImageButtonRenderer.cs
index b553a5c43854..30eeacdef164 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/ImageButtonRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/ImageButtonRenderer.cs
@@ -4,8 +4,8 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Foundation;
-using UIKit;
 using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
+using UIKit;
 using SizeF = CoreGraphics.CGSize;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
@@ -114,7 +114,7 @@ async Task UpdateImage()
 		}
 
 		protected override UIButton CreateNativeControl()
-		{			
+		{
 			return new UIButton(UIButtonType.System);
 		}
 
diff --git a/src/Compatibility/Core/src/iOS/Renderers/ImageElementManager.cs b/src/Compatibility/Core/src/iOS/Renderers/ImageElementManager.cs
index e1b166699ee1..4e744711ffd6 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/ImageElementManager.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/ImageElementManager.cs
@@ -3,7 +3,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Foundation;
-using Microsoft.Maui.Controls.Compatibility.Internals;
 using CoreAnimation;
 
 #if __MOBILE__
diff --git a/src/Compatibility/Core/src/iOS/Renderers/ImageRenderer.cs b/src/Compatibility/Core/src/iOS/Renderers/ImageRenderer.cs
index f50cdd3b3348..b034dec753d6 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/ImageRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/ImageRenderer.cs
@@ -4,31 +4,13 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Foundation;
+using Microsoft.Maui.Graphics;
 using UIKit;
-using Microsoft.Maui.Controls.Compatibility.Internals;
-using RectangleF = CoreGraphics.CGRect;
 using PreserveAttribute = Foundation.PreserveAttribute;
-using Microsoft.Maui.Graphics;
+using RectangleF = CoreGraphics.CGRect;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {
-	public static class ImageExtensions
-	{
-		public static UIViewContentMode ToUIViewContentMode(this Aspect aspect)
-		{
-			switch (aspect)
-			{
-				case Aspect.AspectFill:
-					return UIViewContentMode.ScaleAspectFill;
-				case Aspect.Fill:
-					return UIViewContentMode.ScaleToFill;
-				case Aspect.AspectFit:
-				default:
-					return UIViewContentMode.ScaleAspectFit;
-			}
-		}
-	}
-
 	public class ImageRenderer : ViewRenderer<Image, FormsUIImageView>, IImageVisualElementRenderer
 	{
 		bool _isDisposed;
@@ -214,19 +196,19 @@ public ImageLoaderSourceHandler()
 		public async Task<UIImage> LoadImageAsync(ImageSource imagesource, CancellationToken cancelationToken = default(CancellationToken), float scale = 1f)
 		{
 			UIImage image = null;
-			var imageLoader = imagesource as UriImageSource;
-			if (imageLoader?.Uri != null)
+
+			if (imagesource is IStreamImageSource imageLoader)
 			{
-				using (var streamImage = await imageLoader.GetStreamAsync(cancelationToken).ConfigureAwait(false))
+				using var streamImage = await imageLoader.GetStreamAsync(cancelationToken).ConfigureAwait(false);
+				if (streamImage != null)
 				{
-					if (streamImage != null)
-						image = UIImage.LoadFromData(NSData.FromStream(streamImage), scale);
-				}
-			}
+					image = UIImage.LoadFromData(NSData.FromStream(streamImage), scale);
 
-			if (image == null)
-			{
-				Controls.Internals.Log.Warning(nameof(ImageLoaderSourceHandler), "Could not load image: {0}", imageLoader);
+					if (image == null)
+					{
+						Controls.Internals.Log.Warning(nameof(ImageLoaderSourceHandler), "Could not load image: {0}", imageLoader);
+					}
+				}
 			}
 
 			return image;
@@ -267,7 +249,7 @@ public Task<UIImage> LoadImageAsync(
 				var iconcolor = fontsource.Color ?? _defaultColor;
 				var attString = new NSAttributedString(fontsource.Glyph, font: font, foregroundColor: iconcolor.ToUIColor());
 				var imagesize = ((NSString)fontsource.Glyph).GetSizeUsingAttributes(attString.GetUIKitAttributes(0, out _));
-				
+
 				UIGraphics.BeginImageContextWithOptions(imagesize, false, 0f);
 				var ctx = new NSStringDrawingContext();
 				var boundingRect = attString.GetBoundingRect(imagesize, (NSStringDrawingOptions)0, ctx);
diff --git a/src/Compatibility/Core/src/iOS/Renderers/KeyboardInsetTracker.cs b/src/Compatibility/Core/src/iOS/Renderers/KeyboardInsetTracker.cs
index 8e008095d5bd..e1fc08701729 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/KeyboardInsetTracker.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/KeyboardInsetTracker.cs
@@ -17,7 +17,7 @@ internal class KeyboardInsetTracker : IDisposable
 		ShellScrollViewTracker _shellScrollViewTracker;
 
 
-		public KeyboardInsetTracker(UIScrollView targetView, Func<UIWindow> fetchWindow, Action<UIEdgeInsets> setInsetAction) 
+		public KeyboardInsetTracker(UIScrollView targetView, Func<UIWindow> fetchWindow, Action<UIEdgeInsets> setInsetAction)
 			: this(targetView, fetchWindow, setInsetAction, null)
 		{
 		}
@@ -100,8 +100,8 @@ internal void UpdateInsets()
 
 		void OnKeyboardHidden(object sender, UIKeyboardEventArgs args)
 		{
-			if(_shellScrollViewTracker == null || !_shellScrollViewTracker.Reset())
-				_setInsetAction(new UIEdgeInsets(0,0,0,0));
+			if (_shellScrollViewTracker == null || !_shellScrollViewTracker.Reset())
+				_setInsetAction(new UIEdgeInsets(0, 0, 0, 0));
 
 			_lastKeyboardRect = RectangleF.Empty;
 		}
diff --git a/src/Compatibility/Core/src/iOS/Renderers/LabelRenderer.cs b/src/Compatibility/Core/src/iOS/Renderers/LabelRenderer.cs
index 74f255412553..e16299fca1f2 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/LabelRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/LabelRenderer.cs
@@ -7,6 +7,7 @@
 using System.Diagnostics;
 using Microsoft.Maui.Graphics;
 using Microsoft.Maui.Platform.iOS;
+using Microsoft.Maui.Controls.Platform;
 
 #if __MOBILE__
 using UIKit;
@@ -589,7 +590,7 @@ void UpdateTextColor()
 
 			// default value of color documented to be black in iOS docs
 #if __MOBILE__
-				Control.TextColor = textColor.ToUIColor(ColorExtensions.LabelColor);
+			Control.TextColor = textColor.ToUIColor(ColorExtensions.LabelColor);
 #else
 			var alignment = Element.HorizontalTextAlignment.ToNativeTextAlignment(((IVisualElementController)Element).EffectiveFlowDirection);
 			var textWithColor = new NSAttributedString(Element.Text ?? "", font: Element.ToNSFont(), foregroundColor: textColor.ToNSColor(ColorExtensions.TextColor), paragraphStyle: new NSMutableParagraphStyle() { Alignment = alignment });
diff --git a/src/Compatibility/Core/src/iOS/Renderers/ListViewRenderer.cs b/src/Compatibility/Core/src/iOS/Renderers/ListViewRenderer.cs
index a392a4dab571..506f3519f437 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/ListViewRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/ListViewRenderer.cs
@@ -5,13 +5,14 @@
 using System.ComponentModel;
 using System.Linq;
 using Foundation;
-using UIKit;
 using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Controls.Platform;
+using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
+using Microsoft.Maui.Graphics;
+using UIKit;
 using RectangleF = CoreGraphics.CGRect;
 using SizeF = CoreGraphics.CGSize;
-using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
 using Specifics = Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific.ListView;
-using Microsoft.Maui.Graphics;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {
@@ -293,7 +294,7 @@ protected override void OnElementChanged(ElementChangedEventArgs<ListView> e)
 				UpdateRowHeight();
 
 				Control.Source = _dataSource = e.NewElement.HasUnevenRows ? new UnevenListViewDataSource(e.NewElement, _tableViewController) : new ListViewDataSource(e.NewElement, _tableViewController);
-			
+
 				UpdateHeader();
 				UpdateFooter();
 				UpdatePullToRefreshEnabled();
@@ -1515,7 +1516,8 @@ public HeaderWrapperView(string reuseIdentifier) : base((NSString)reuseIdentifie
 
 		public void SetTableViewCell(UITableViewCell value)
 		{
-			if (ReferenceEquals(_tableViewCell, value)) return;
+			if (ReferenceEquals(_tableViewCell, value))
+				return;
 			_tableViewCell?.RemoveFromSuperview();
 			_tableViewCell = value;
 			AddSubview(value);
@@ -1576,7 +1578,7 @@ public void UpdateIsRefreshing(bool refreshing)
 						if (_refresh == null || _disposed)
 							return;
 
-						if( _isStartRefreshingPending)
+						if (_isStartRefreshingPending)
 							StartRefreshing();
 
 
diff --git a/src/Compatibility/Core/src/iOS/Renderers/NavigationRenderer.cs b/src/Compatibility/Core/src/iOS/Renderers/NavigationRenderer.cs
index bcb265ec0518..19c00188b7ea 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/NavigationRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/NavigationRenderer.cs
@@ -4,17 +4,17 @@
 using System.Linq;
 using System.Threading.Tasks;
 using CoreGraphics;
-using UIKit;
-using Microsoft.Maui.Controls.Compatibility.Internals;
+using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
+using Microsoft.Maui.Graphics;
+using UIKit;
 using static Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific.NavigationPage;
 using static Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific.Page;
 using PageUIStatusBarAnimation = Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific.UIStatusBarAnimation;
 using PointF = CoreGraphics.CGPoint;
 using RectangleF = CoreGraphics.CGRect;
 using SizeF = CoreGraphics.CGSize;
-using Microsoft.Maui.Controls.Internals;
-using Microsoft.Maui.Graphics;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {
@@ -215,18 +215,18 @@ public override void ViewDidLoad()
 			FindParentFlyoutPage();
 
 			var navPage = NavPage;
-
+			INavigationPageController navPageController = NavPage;
 			if (navPage.CurrentPage == null)
 			{
 				throw new InvalidOperationException(
 					"NavigationPage must have a root Page before being used. Either call PushAsync with a valid Page, or pass a Page to the constructor before usage.");
 			}
 
-			navPage.PushRequested += OnPushRequested;
-			navPage.PopRequested += OnPopRequested;
-			navPage.PopToRootRequested += OnPopToRootRequested;
-			navPage.RemovePageRequested += OnRemovedPageRequested;
-			navPage.InsertPageBeforeRequested += OnInsertPageBeforeRequested;
+			navPageController.PushRequested += OnPushRequested;
+			navPageController.PopRequested += OnPopRequested;
+			navPageController.PopToRootRequested += OnPopToRootRequested;
+			navPageController.RemovePageRequested += OnRemovedPageRequested;
+			navPageController.InsertPageBeforeRequested += OnInsertPageBeforeRequested;
 
 			UpdateBarBackground();
 			UpdateBarTextColor();
@@ -275,13 +275,14 @@ protected override void Dispose(bool disposing)
 				Current = null; // unhooks events
 
 				var navPage = NavPage;
+				INavigationPageController navPageController = NavPage;
 				navPage.PropertyChanged -= HandlePropertyChanged;
 
-				navPage.PushRequested -= OnPushRequested;
-				navPage.PopRequested -= OnPopRequested;
-				navPage.PopToRootRequested -= OnPopToRootRequested;
-				navPage.RemovePageRequested -= OnRemovedPageRequested;
-				navPage.InsertPageBeforeRequested -= OnInsertPageBeforeRequested;
+				navPageController.PushRequested -= OnPushRequested;
+				navPageController.PopRequested -= OnPopRequested;
+				navPageController.PopToRootRequested -= OnPopToRootRequested;
+				navPageController.RemovePageRequested -= OnRemovedPageRequested;
+				navPageController.InsertPageBeforeRequested -= OnInsertPageBeforeRequested;
 			}
 
 			base.Dispose(disposing);
diff --git a/src/Compatibility/Core/src/iOS/Renderers/OpenGLViewRenderer.cs b/src/Compatibility/Core/src/iOS/Renderers/OpenGLViewRenderer.cs
index cff874eccf04..f207445d4670 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/OpenGLViewRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/OpenGLViewRenderer.cs
@@ -1,9 +1,9 @@
 using System;
 using System.ComponentModel;
+using CoreAnimation;
+using Foundation;
 using GLKit;
 using OpenGLES;
-using Foundation;
-using CoreAnimation;
 using RectangleF = CoreGraphics.CGRect;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
diff --git a/src/Compatibility/Core/src/iOS/Renderers/PageContainer.cs b/src/Compatibility/Core/src/iOS/Renderers/PageContainer.cs
index 01f8e52199ab..756f10193a01 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/PageContainer.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/PageContainer.cs
@@ -1,7 +1,7 @@
-using Foundation;
-using ObjCRuntime;
 using System;
 using System.Collections.Generic;
+using Foundation;
+using ObjCRuntime;
 using UIKit;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
@@ -38,12 +38,12 @@ public virtual NSArray AccessibilityElements
 			{
 				if (_loaded)
 					return _accessibilityElements;
-				
+
 				// lazy-loading this list so that the expensive call to GetAccessibilityElements only happens when VoiceOver is on.
 				if (_accessibilityElements == null || _accessibilityElements.Count == 0)
 				{
-					var elements =_parent.GetAccessibilityElements();
-					if(elements != null)
+					var elements = _parent.GetAccessibilityElements();
+					if (elements != null)
 					{
 						_accessibilityElements = NSArray.FromNSObjects(elements.ToArray());
 					}
diff --git a/src/Compatibility/Core/src/iOS/Renderers/PageRenderer.cs b/src/Compatibility/Core/src/iOS/Renderers/PageRenderer.cs
index 39b92f3717ef..f4641bada36f 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/PageRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/PageRenderer.cs
@@ -2,11 +2,12 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using Foundation;
-using UIKit;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
-using PageUIStatusBarAnimation = Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific.UIStatusBarAnimation;
-using PageSpecific = Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific.Page;
 using Microsoft.Maui.Graphics;
+using UIKit;
+using PageSpecific = Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific.Page;
+using PageUIStatusBarAnimation = Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific.UIStatusBarAnimation;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {
@@ -103,7 +104,7 @@ public UIView NativeView
 		{
 			get { return _disposed ? null : View; }
 		}
-		
+
 		public void SetElement(VisualElement element)
 		{
 			VisualElement oldElement = Element;
@@ -282,10 +283,10 @@ void IDisconnectable.Disconnect()
 
 				if (_appeared)
 					Page.SendDisappearing();
-				
+
 				Element = null;
 			}
-				
+
 			_events?.Disconnect();
 			_packager?.Disconnect();
 			_tracker?.Disconnect();
diff --git a/src/Compatibility/Core/src/iOS/Renderers/PhoneFlyoutPageRenderer.cs b/src/Compatibility/Core/src/iOS/Renderers/PhoneFlyoutPageRenderer.cs
index fd9841c7ca68..d8017da21032 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/PhoneFlyoutPageRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/PhoneFlyoutPageRenderer.cs
@@ -1,11 +1,12 @@
 using System;
 using System.ComponentModel;
 using System.Linq;
-using UIKit;
 using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
-using PointF = CoreGraphics.CGPoint;
 using Microsoft.Maui.Graphics;
+using UIKit;
+using PointF = CoreGraphics.CGPoint;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {
diff --git a/src/Compatibility/Core/src/iOS/Renderers/PickerRenderer.cs b/src/Compatibility/Core/src/iOS/Renderers/PickerRenderer.cs
index e2c1c445e0ec..5615e57d375d 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/PickerRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/PickerRenderer.cs
@@ -4,12 +4,12 @@
 using System.ComponentModel;
 using CoreGraphics;
 using Foundation;
-using ObjCRuntime;
-using UIKit;
 using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
-using RectangleF = CoreGraphics.CGRect;
 using Microsoft.Maui.Graphics;
 using Microsoft.Maui.Platform.iOS;
+using ObjCRuntime;
+using UIKit;
+using RectangleF = CoreGraphics.CGRect;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {
@@ -18,12 +18,13 @@ internal class ReadOnlyField : NoCaretField
 	{
 		readonly HashSet<string> enableActions;
 
-		public ReadOnlyField() {
+		public ReadOnlyField()
+		{
 			string[] actions = { "copy:", "select:", "selectAll:" };
-			enableActions = new HashSet<string> (actions);
+			enableActions = new HashSet<string>(actions);
 		}
 
-		public override bool CanPerform (Selector action, NSObject withSender)
+		public override bool CanPerform(Selector action, NSObject withSender)
 			=> enableActions.Contains(action.Name);
 	}
 
@@ -150,7 +151,7 @@ protected override void OnElementPropertyChanged(object sender, PropertyChangedE
 			else if (e.PropertyName == Picker.TextColorProperty.PropertyName || e.PropertyName == VisualElement.IsEnabledProperty.PropertyName)
 				UpdateTextColor();
 			else if (e.PropertyName == Picker.FontAttributesProperty.PropertyName || e.PropertyName == Picker.FontFamilyProperty.PropertyName ||
-			         e.PropertyName == Picker.FontSizeProperty.PropertyName)
+					 e.PropertyName == Picker.FontSizeProperty.PropertyName)
 			{
 				UpdateFont();
 			}
@@ -206,9 +207,9 @@ protected void UpdateCharacterSpacing()
 		}
 
 		[PortHandler]
-        protected internal virtual void UpdateFont()
+		protected internal virtual void UpdateFont()
 		{
-			Control.Font = Element.ToUIFont();			
+			Control.Font = Element.ToUIFont();
 		}
 
 		readonly Color _defaultPlaceholderColor = ColorExtensions.PlaceholderColor.ToColor();
@@ -236,7 +237,7 @@ protected internal virtual void UpdatePlaceholder()
 			UpdateAttributedPlaceholder(Control.AttributedPlaceholder.WithCharacterSpacing(Element.CharacterSpacing));
 		}
 
-		protected virtual void UpdateAttributedPlaceholder(NSAttributedString nsAttributedString) => 
+		protected virtual void UpdateAttributedPlaceholder(NSAttributedString nsAttributedString) =>
 			Control.AttributedPlaceholder = nsAttributedString;
 
 		[PortHandler]
@@ -291,7 +292,7 @@ void UpdateHorizontalTextAlignment()
 		}
 		void UpdateVerticalTextAlignment()
 		{
-			Control.VerticalAlignment = Element.VerticalTextAlignment.ToNativeTextAlignment();			
+			Control.VerticalAlignment = Element.VerticalTextAlignment.ToNativeTextAlignment();
 		}
 
 		protected internal virtual void UpdateTextColor()
@@ -304,8 +305,8 @@ protected internal virtual void UpdateTextColor()
 				Control.TextColor = textColor.ToUIColor();
 
 			// HACK This forces the color to update; there's probably a more elegant way to make this happen
-			Control.Text = Control.Text;			
-		}		
+			Control.Text = Control.Text;
+		}
 
 		protected override void Dispose(bool disposing)
 		{
@@ -338,7 +339,7 @@ protected override void Dispose(bool disposing)
 					Control.EditingChanged -= OnEditing;
 				}
 
-				if(Element != null)
+				if (Element != null)
 					((INotifyCollectionChanged)Element.Items).CollectionChanged -= RowsCollectionChanged;
 			}
 
@@ -388,7 +389,7 @@ public override void Selected(UIPickerView picker, nint row, nint component)
 					SelectedIndex = (int)row;
 				}
 
-				if(_renderer.Element.On<PlatformConfiguration.iOS>().UpdateMode() == UpdateMode.Immediately)
+				if (_renderer.Element.On<PlatformConfiguration.iOS>().UpdateMode() == UpdateMode.Immediately)
 					_renderer.UpdatePickerFromModel(this);
 			}
 
diff --git a/src/Compatibility/Core/src/iOS/Renderers/RefreshViewRenderer.cs b/src/Compatibility/Core/src/iOS/Renderers/RefreshViewRenderer.cs
index 293f61a4c84c..daccd54d9326 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/RefreshViewRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/RefreshViewRenderer.cs
@@ -1,8 +1,9 @@
 using System;
 using System.ComponentModel;
-using UIKit;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
 using Microsoft.Maui.Graphics;
+using UIKit;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {
diff --git a/src/Compatibility/Core/src/iOS/Renderers/ScrollViewRenderer.cs b/src/Compatibility/Core/src/iOS/Renderers/ScrollViewRenderer.cs
index 96dbea61ddf0..636cc69b2393 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/ScrollViewRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/ScrollViewRenderer.cs
@@ -1,12 +1,13 @@
 using System;
 using System.ComponentModel;
+using CoreGraphics;
 using Microsoft.Maui.Controls.Internals;
-using UIKit;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
+using Microsoft.Maui.Graphics;
+using UIKit;
 using PointF = CoreGraphics.CGPoint;
 using RectangleF = CoreGraphics.CGRect;
-using CoreGraphics;
-using Microsoft.Maui.Graphics;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {
@@ -80,7 +81,7 @@ public void SetElement(VisualElement element)
 					_insetTracker = new KeyboardInsetTracker(this, () => Window, insets =>
 					{
 						ContentInset = ScrollIndicatorInsets = insets;
-					}, 
+					},
 					point =>
 					{
 						var offset = ContentOffset;
@@ -118,13 +119,13 @@ public UIViewController ViewController
 		{
 			get { return null; }
 		}
-				
+
 		public override void LayoutSubviews()
 		{
 			_insetTracker?.OnLayoutSubviews();
 			base.LayoutSubviews();
 
-			if(Superview != null && ScrollView != null)
+			if (Superview != null && ScrollView != null)
 			{
 				if (_requestedScroll != null)
 				{
@@ -195,7 +196,7 @@ protected override void Dispose(bool disposing)
 			base.Dispose(disposing);
 		}
 
-		protected virtual void OnElementChanged(VisualElementChangedEventArgs e) => ElementChanged?.Invoke(this, e); 
+		protected virtual void OnElementChanged(VisualElementChangedEventArgs e) => ElementChanged?.Invoke(this, e);
 
 		void HandlePropertyChanged(object sender, PropertyChangedEventArgs e)
 		{
@@ -228,15 +229,15 @@ void UpdateIsEnabled()
 		void UpdateVerticalScrollBarVisibility()
 		{
 			var verticalScrollBarVisibility = ScrollView.VerticalScrollBarVisibility;
-			ShowsVerticalScrollIndicator = verticalScrollBarVisibility == ScrollBarVisibility.Always 
-			                               || verticalScrollBarVisibility == ScrollBarVisibility.Default;
+			ShowsVerticalScrollIndicator = verticalScrollBarVisibility == ScrollBarVisibility.Always
+										   || verticalScrollBarVisibility == ScrollBarVisibility.Default;
 		}
 
 		void UpdateHorizontalScrollBarVisibility()
 		{
 			var horizontalScrollBarVisibility = ScrollView.HorizontalScrollBarVisibility;
 			ShowsHorizontalScrollIndicator = horizontalScrollBarVisibility == ScrollBarVisibility.Always
-			                               || horizontalScrollBarVisibility == ScrollBarVisibility.Default;
+										   || horizontalScrollBarVisibility == ScrollBarVisibility.Default;
 		}
 
 		void HandleScrollAnimationEnded(object sender, EventArgs e)
diff --git a/src/Compatibility/Core/src/iOS/Renderers/SearchBarRenderer.cs b/src/Compatibility/Core/src/iOS/Renderers/SearchBarRenderer.cs
index c2295301649f..fc750b34cf0c 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/SearchBarRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/SearchBarRenderer.cs
@@ -2,10 +2,10 @@
 using System.ComponentModel;
 using CoreGraphics;
 using Foundation;
-using UIKit;
 using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
 using Microsoft.Maui.Graphics;
 using Microsoft.Maui.Platform.iOS;
+using UIKit;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {
@@ -131,13 +131,13 @@ protected override void OnElementPropertyChanged(object sender, PropertyChangedE
 				UpdateVerticalTextAlignment();
 			else if (e.PropertyName == VisualElement.FlowDirectionProperty.PropertyName)
 				UpdateHorizontalTextAlignment();
-			else if(e.PropertyName == Microsoft.Maui.Controls.InputView.MaxLengthProperty.PropertyName)
+			else if (e.PropertyName == Microsoft.Maui.Controls.InputView.MaxLengthProperty.PropertyName)
 				UpdateMaxLength();
-			else if(e.PropertyName == Microsoft.Maui.Controls.InputView.KeyboardProperty.PropertyName)
+			else if (e.PropertyName == Microsoft.Maui.Controls.InputView.KeyboardProperty.PropertyName)
 				UpdateKeyboard();
-			else if(e.PropertyName == Microsoft.Maui.Controls.InputView.IsSpellCheckEnabledProperty.PropertyName)
+			else if (e.PropertyName == Microsoft.Maui.Controls.InputView.IsSpellCheckEnabledProperty.PropertyName)
 				UpdateKeyboard();
-			else if(e.PropertyName == PlatformConfiguration.iOSSpecific.SearchBar.SearchBarStyleProperty.PropertyName)
+			else if (e.PropertyName == PlatformConfiguration.iOSSpecific.SearchBar.SearchBarStyleProperty.PropertyName)
 				UpdateSearchBarStyle();
 		}
 
@@ -152,7 +152,7 @@ protected override void SetBackgroundColor(Color color)
 			{
 				_defaultTintColor = Control.BarTintColor;
 			}
-			
+
 			Control.BarTintColor = color.ToUIColor(_defaultTintColor);
 
 			Control.SetBackgroundImage(new UIImage(), UIBarPosition.Any, UIBarMetrics.Default);
@@ -322,7 +322,7 @@ void UpdatePlaceholder()
 				// Placeholder default color is 70% gray
 				// https://developer.apple.com/library/prerelease/ios/documentation/UIKit/Reference/UITextField_Class/index.html#//apple_ref/occ/instp/UITextField/placeholder
 
-				var color = Element.IsEnabled && targetColor != null 
+				var color = Element.IsEnabled && targetColor != null
 					? targetColor : ColorExtensions.PlaceholderColor.ToColor();
 
 				_textField.AttributedPlaceholder = formatted.ToAttributed(Element, color);
@@ -331,7 +331,7 @@ void UpdatePlaceholder()
 			}
 			else
 			{
-				_textField.AttributedPlaceholder = formatted.ToAttributed(Element, targetColor == null 
+				_textField.AttributedPlaceholder = formatted.ToAttributed(Element, targetColor == null
 					? ColorExtensions.PlaceholderColor.ToColor() : targetColor);
 				_textField.AttributedPlaceholder.WithCharacterSpacing(Element.CharacterSpacing);
 			}
@@ -348,7 +348,7 @@ void UpdateText()
 			// other changes to Element.Text.
 			if (!_textWasTyped)
 				Control.Text = Element.UpdateFormsText(Element.Text, Element.TextTransform);
-			
+
 			UpdateCancelButton();
 		}
 
diff --git a/src/Compatibility/Core/src/iOS/Renderers/ShellFlyoutContentRenderer.cs b/src/Compatibility/Core/src/iOS/Renderers/ShellFlyoutContentRenderer.cs
index 55446745c3e1..aecd17c16dff 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/ShellFlyoutContentRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/ShellFlyoutContentRenderer.cs
@@ -1,7 +1,8 @@
-using CoreGraphics;
-using Microsoft.Maui.Graphics;
 using System;
 using System.ComponentModel;
+using CoreGraphics;
+using Microsoft.Maui.Controls.Platform;
+using Microsoft.Maui.Graphics;
 using UIKit;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
@@ -86,7 +87,7 @@ void UpdateFlyoutHeader()
 				return;
 
 			int previousIndex = GetPreviousIndex(_headerView);
-			if(_headerView != null)
+			if (_headerView != null)
 			{
 				_tableViewController.HeaderView = null;
 				_headerView.RemoveFromSuperview();
diff --git a/src/Compatibility/Core/src/iOS/Renderers/ShellFlyoutLayoutManager.cs b/src/Compatibility/Core/src/iOS/Renderers/ShellFlyoutLayoutManager.cs
index 58a71fc914b5..1bbebb8c9436 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/ShellFlyoutLayoutManager.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/ShellFlyoutLayoutManager.cs
@@ -52,7 +52,7 @@ public void SetCustomContent(View content)
 				oldRenderer?.Dispose();
 			}
 			// If the user hasn't defined custom content then only the ContentView is set
-			else if(ContentView != null)
+			else if (ContentView != null)
 			{
 				var oldContentView = ContentView;
 				ContentView = null;
@@ -77,7 +77,7 @@ public void SetCustomContent(View content)
 					void ScrollViewScrolled(object sender, ScrolledEventArgs e) =>
 						OnScrolled((nfloat)sv.ScrollY);
 				}
-				else if(Content is CollectionView cv)
+				else if (Content is CollectionView cv)
 				{
 					cv.Scrolled += CollectionViewScrolled;
 					removeScolledEvent = () => cv.Scrolled -= CollectionViewScrolled;
@@ -90,7 +90,7 @@ void CollectionViewScrolled(object sender, ItemsViewScrolledEventArgs e) =>
 					removeScolledEvent = () => lv.Scrolled -= ListViewScrolled;
 					void ListViewScrolled(object sender, ScrolledEventArgs e) =>
 						OnScrolled((nfloat)e.ScrollY);
-				}				
+				}
 			}
 		}
 
@@ -253,7 +253,7 @@ public void LayoutParallax()
 				{
 					topMargin = (float)Content.Margin.Top;
 				}
-				else if(HeaderView == null)
+				else if (HeaderView == null)
 				{
 					topMargin = (float)Platform.SafeAreaInsetsForWindow.Top;
 				}
@@ -273,7 +273,7 @@ public void LayoutParallax()
 				var leftMargin = margin.Left - margin.Right;
 
 				HeaderView.Frame = new CGRect(leftMargin, _headerOffset, parent.Frame.Width, HeaderSize + HeaderTopMargin);
-				
+
 				if (_context.Shell.FlyoutHeaderBehavior == FlyoutHeaderBehavior.Scroll && HeaderTopMargin > 0 && _headerOffset < 0)
 				{
 					var headerHeight = Math.Max(_headerMin, HeaderSize + _headerOffset + HeaderTopMargin);
diff --git a/src/Compatibility/Core/src/iOS/Renderers/ShellFlyoutRenderer.cs b/src/Compatibility/Core/src/iOS/Renderers/ShellFlyoutRenderer.cs
index 3abb1a1be8e6..d9e25a258d5c 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/ShellFlyoutRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/ShellFlyoutRenderer.cs
@@ -1,9 +1,10 @@
+using System;
+using System.ComponentModel;
 using CoreAnimation;
 using CoreGraphics;
 using Foundation;
 using MediaPlayer;
-using System;
-using System.ComponentModel;
+using Microsoft.Maui.Controls.Platform;
 using UIKit;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
@@ -25,7 +26,7 @@ void IAppearanceObserver.OnAppearanceChanged(ShellAppearance appearance)
 				if (SlideFlyoutTransition?.UpdateFlyoutSize(appearance.FlyoutHeight, appearance.FlyoutWidth) ==
 					true)
 				{
-					if(_layoutOccured)
+					if (_layoutOccured)
 						LayoutSidebar(false, true);
 				}
 			}
diff --git a/src/Compatibility/Core/src/iOS/Renderers/ShellItemRenderer.cs b/src/Compatibility/Core/src/iOS/Renderers/ShellItemRenderer.cs
index 8b2e77680ff7..3cac32183a83 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/ShellItemRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/ShellItemRenderer.cs
@@ -1,13 +1,13 @@
-using CoreGraphics;
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Linq;
+using CoreGraphics;
 using Foundation;
+using Microsoft.Maui.Graphics;
 using ObjCRuntime;
 using UIKit;
-using Microsoft.Maui.Graphics;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {
@@ -137,13 +137,13 @@ void IDisconnectable.Disconnect()
 				((IShellSectionController)_currentSection).RemoveDisplayedPageObserver(this);
 
 
-			if(ShellItem != null)
+			if (ShellItem != null)
 				ShellItem.PropertyChanged -= OnElementPropertyChanged;
 
-			if(_context?.Shell is IShellController shellController)
+			if (_context?.Shell is IShellController shellController)
 				shellController.RemoveAppearanceObserver(this);
 
-			if(ShellItemController != null)
+			if (ShellItemController != null)
 				ShellItemController.ItemsCollectionChanged -= OnItemsCollectionChanged;
 		}
 
@@ -314,7 +314,7 @@ void UpdateMoreCellsEnabled()
 			// now that they are applied we can set the enabled state of the TabBar items
 			for (int i = 4; i < viewControllersLength; i++)
 			{
-				if((i - 4) >= (moreNavigationCells.Length))
+				if ((i - 4) >= (moreNavigationCells.Length))
 				{
 					break;
 				}
@@ -331,7 +331,7 @@ void UpdateMoreCellsEnabled()
 
 					cell.TextLabel.TextColor = Color.FromRgb(213, 213, 213).ToUIColor();
 				}
-				else if(!cell.UserInteractionEnabled)
+				else if (!cell.UserInteractionEnabled)
 				{
 					cell.UserInteractionEnabled = true;
 					cell.TextLabel.TextColor = _defaultMoreTextLabelTextColor;
@@ -340,7 +340,7 @@ void UpdateMoreCellsEnabled()
 
 			UITableViewCell[] GetMoreNavigationCells()
 			{
-				if(MoreNavigationController.TopViewController.View is UITableView uITableView)
+				if (MoreNavigationController.TopViewController.View is UITableView uITableView)
 					return uITableView.VisibleCells;
 
 				return new UITableViewCell[0];
diff --git a/src/Compatibility/Core/src/iOS/Renderers/ShellPageRendererTracker.cs b/src/Compatibility/Core/src/iOS/Renderers/ShellPageRendererTracker.cs
index ebf0f6838038..9f22304a6561 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/ShellPageRendererTracker.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/ShellPageRendererTracker.cs
@@ -1,11 +1,11 @@
-using CoreGraphics;
-using Foundation;
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Threading.Tasks;
 using System.Windows.Input;
+using CoreGraphics;
+using Foundation;
 using UIKit;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
@@ -154,7 +154,7 @@ protected virtual async void OnPageSet(Page oldPage, Page newPage)
 				if (oldPage == null)
 					((IShellController)_context.Shell).AddFlyoutBehaviorObserver(this);
 			}
-			else if(newPage == null && _context?.Shell is IShellController shellController)
+			else if (newPage == null && _context?.Shell is IShellController shellController)
 			{
 				shellController.RemoveFlyoutBehaviorObserver(this);
 			}
@@ -249,7 +249,7 @@ async Task UpdateLeftToolbarItems()
 			var command = behavior.GetPropertyIfSet<object>(BackButtonBehavior.CommandProperty, null);
 
 			UIImage icon = null;
-			
+
 			if (String.IsNullOrWhiteSpace(text) && image == null)
 			{
 				image = _context.Shell.FlyoutIcon;
@@ -319,7 +319,7 @@ void LeftBarButtonItemHandler(UIViewController controller, bool isRootPage)
 				else if (controller?.ParentViewController is UINavigationController navigationController)
 					navigationController.PopViewController(true);
 			}
-			else if(_flyoutBehavior == FlyoutBehavior.Flyout)
+			else if (_flyoutBehavior == FlyoutBehavior.Flyout)
 			{
 				_context.Shell.SetValueFromRenderer(Shell.FlyoutIsPresentedProperty, true);
 			}
diff --git a/src/Compatibility/Core/src/iOS/Renderers/ShellRenderer.cs b/src/Compatibility/Core/src/iOS/Renderers/ShellRenderer.cs
index e288963b548f..0bba227e82c3 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/ShellRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/ShellRenderer.cs
@@ -113,7 +113,7 @@ public virtual void SetElementSize(Size size)
 		public override void ViewDidLayoutSubviews()
 		{
 			base.ViewDidLayoutSubviews();
-			if(_currentShellItemRenderer != null)
+			if (_currentShellItemRenderer != null)
 				_currentShellItemRenderer.ViewController.View.Frame = View.Bounds;
 
 			SetElementSize(new Size(View.Bounds.Width, View.Bounds.Height));
@@ -129,7 +129,7 @@ public override void ViewDidLoad()
 		protected virtual IShellFlyoutRenderer CreateFlyoutRenderer()
 		{
 			// HACK
-			if(UIApplication.SharedApplication?.Delegate?.GetType()?.FullName == "XamarinFormsPreviewer.iOS.AppDelegate")
+			if (UIApplication.SharedApplication?.Delegate?.GetType()?.FullName == "XamarinFormsPreviewer.iOS.AppDelegate")
 			{
 				return new DesignerFlyoutRenderer(this);
 			}
@@ -202,7 +202,7 @@ protected virtual async void OnCurrentItemChanged()
 			{
 				await OnCurrentItemChangedAsync();
 			}
-			catch(Exception exc)
+			catch (Exception exc)
 			{
 				Controls.Internals.Log.Warning(nameof(Shell), $"Failed on changing current item: {exc}");
 			}
@@ -234,7 +234,7 @@ protected virtual void OnElementPropertyChanged(object sender, PropertyChangedEv
 			{
 				OnCurrentItemChanged();
 			}
-			else if(e.PropertyName == VisualElement.FlowDirectionProperty.PropertyName)
+			else if (e.PropertyName == VisualElement.FlowDirectionProperty.PropertyName)
 			{
 				UpdateFlowDirection(true);
 			}
@@ -283,7 +283,7 @@ protected async Task SetCurrentShellItemControllerAsync(IShellItemRenderer value
 
 			// This means the selected item changed while the active transition
 			// was finishing up
-			if(_incomingRenderer != value ||
+			if (_incomingRenderer != value ||
 				value.ShellItem != this.Shell.CurrentItem)
 			{
 				(value as IDisconnectable)?.Disconnect();
@@ -302,7 +302,7 @@ protected async Task SetCurrentShellItemControllerAsync(IShellItemRenderer value
 			View.SendSubviewToBack(newRenderer.ViewController.View);
 
 			newRenderer.ViewController.View.Frame = View.Bounds;
-			
+
 			if (oldRenderer != null)
 			{
 				var transition = CreateShellItemTransition();
@@ -320,7 +320,7 @@ protected async Task SetCurrentShellItemControllerAsync(IShellItemRenderer value
 			}
 
 			// current renderer is still valid
-			if(_currentShellItemRenderer == value)
+			if (_currentShellItemRenderer == value)
 			{
 				UpdateBackgroundColor();
 				UpdateFlowDirection();
diff --git a/src/Compatibility/Core/src/iOS/Renderers/ShellScrollViewTracker.cs b/src/Compatibility/Core/src/iOS/Renderers/ShellScrollViewTracker.cs
index b27aa7c0bf11..0b43b3f3ad29 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/ShellScrollViewTracker.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/ShellScrollViewTracker.cs
@@ -72,7 +72,7 @@ public void OnLayoutSubviews()
 				var newBounds = _scrollView.AdjustedContentInset.InsetRect(_scrollView.Bounds).ToRectangle();
 				newBounds.X = 0;
 				newBounds.Y = 0;
-				if(_renderer.Element is ScrollView scrollView)
+				if (_renderer.Element is ScrollView scrollView)
 					scrollView.LayoutAreaOverride = newBounds;
 			}
 		}
@@ -154,7 +154,7 @@ void UpdateVerticalBounce()
 			// If we can't bounce in that case you may not be able to expose the handler.
 			// Also the hiding behavior only depends on scroll on iOS 11. In 10 and below
 			// the search goes in the TitleView so there is nothing to collapse/expand.
-			if (!Forms.IsiOS11OrNewer || 
+			if (!Forms.IsiOS11OrNewer ||
 				(_renderer.Element is ScrollView scrollView && scrollView.Orientation == ScrollOrientation.Horizontal))
 				return;
 
diff --git a/src/Compatibility/Core/src/iOS/Renderers/ShellSearchResultsRenderer.cs b/src/Compatibility/Core/src/iOS/Renderers/ShellSearchResultsRenderer.cs
index 52128a7661d6..c4d990a36fe6 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/ShellSearchResultsRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/ShellSearchResultsRenderer.cs
@@ -1,8 +1,8 @@
-using Foundation;
 using System;
 using System.Collections.Specialized;
-using UIKit;
+using Foundation;
 using Microsoft.Maui.Controls.Internals;
+using UIKit;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {
diff --git a/src/Compatibility/Core/src/iOS/Renderers/ShellSectionRenderer.cs b/src/Compatibility/Core/src/iOS/Renderers/ShellSectionRenderer.cs
index 2e84afb1318c..962448441539 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/ShellSectionRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/ShellSectionRenderer.cs
@@ -5,9 +5,9 @@
 using System.Threading.Tasks;
 using System.Windows.Input;
 using Foundation;
+using Microsoft.Maui.Controls.Internals;
 using ObjCRuntime;
 using UIKit;
-using Microsoft.Maui.Controls.Internals;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {
@@ -75,7 +75,7 @@ public ShellSectionRenderer(IShellContext context) : base()
 			_context.Shell.PropertyChanged += HandleShellPropertyChanged;
 		}
 
-		public ShellSectionRenderer(IShellContext context, Type navigationBarType, Type toolbarType) 
+		public ShellSectionRenderer(IShellContext context, Type navigationBarType, Type toolbarType)
 			: base(navigationBarType, toolbarType)
 		{
 			Delegate = new NavDelegate(this);
@@ -89,7 +89,7 @@ public bool ShouldPopItem(UINavigationBar navigationBar, UINavigationItem item)
 			SendPop();
 
 		internal bool SendPop()
-		{ 
+		{
 			// this means the pop is already done, nothing we can do
 			if (ViewControllers.Length < NavigationBar.Items.Length)
 				return true;
diff --git a/src/Compatibility/Core/src/iOS/Renderers/ShellSectionRootHeader.cs b/src/Compatibility/Core/src/iOS/Renderers/ShellSectionRootHeader.cs
index 5a1eb5a63fd5..334b4f91457a 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/ShellSectionRootHeader.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/ShellSectionRootHeader.cs
@@ -1,9 +1,9 @@
-using CoreGraphics;
-using Foundation;
-using Microsoft.Maui.Graphics;
 using System;
 using System.Collections.Specialized;
 using System.ComponentModel;
+using CoreGraphics;
+using Foundation;
+using Microsoft.Maui.Graphics;
 using UIKit;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
@@ -116,7 +116,7 @@ public override nint GetItemsCount(UICollectionView collectionView, nint section
 
 		public override void ItemDeselected(UICollectionView collectionView, NSIndexPath indexPath)
 		{
-			if(CollectionView.CellForItem(indexPath) is ShellSectionHeaderCell cell)
+			if (CollectionView.CellForItem(indexPath) is ShellSectionHeaderCell cell)
 				cell.Label.TextColor = _unselectedColor.ToUIColor();
 		}
 
diff --git a/src/Compatibility/Core/src/iOS/Renderers/ShellSectionRootRenderer.cs b/src/Compatibility/Core/src/iOS/Renderers/ShellSectionRootRenderer.cs
index 82887716dff3..cc394c6fe764 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/ShellSectionRootRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/ShellSectionRootRenderer.cs
@@ -1,10 +1,10 @@
-using CoreAnimation;
-using CoreGraphics;
-using Foundation;
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.ComponentModel;
+using CoreAnimation;
+using CoreGraphics;
+using Foundation;
 using UIKit;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
@@ -95,7 +95,7 @@ public override void ViewDidLoad()
 			tracker.IsRootPage = true;
 			tracker.ViewController = this;
 
-			if(ShellSection.CurrentItem != null)
+			if (ShellSection.CurrentItem != null)
 				tracker.Page = ((IShellContentController)ShellSection.CurrentItem).GetOrCreateContent();
 			_tracker = tracker;
 			UpdateFlowDirection();
@@ -106,7 +106,7 @@ public override void ViewWillAppear(bool animated)
 			if (_isDisposed)
 				return;
 
-				UpdateFlowDirection();
+			UpdateFlowDirection();
 			base.ViewWillAppear(animated);
 		}
 
@@ -165,7 +165,7 @@ protected override void Dispose(bool disposing)
 				{
 					var oldRenderer = renderer.Value;
 
-					if(oldRenderer.NativeView != null)
+					if (oldRenderer.NativeView != null)
 						oldRenderer.NativeView.RemoveFromSuperview();
 
 					if (oldRenderer.ViewController != null)
@@ -179,7 +179,7 @@ protected override void Dispose(bool disposing)
 				_renderers.Clear();
 			}
 
-			if(disposing)
+			if (disposing)
 			{
 				_shellContext.Shell.PropertyChanged -= HandleShellPropertyChanged;
 			}
@@ -204,7 +204,7 @@ protected virtual void LayoutRenderers()
 				if (_renderers.TryGetValue(shellContent, out var renderer))
 				{
 					var view = renderer.NativeView;
-					if(view != null)
+					if (view != null)
 						view.Frame = new CGRect(0, 0, View.Bounds.Width, View.Bounds.Height);
 				}
 			}
@@ -235,7 +235,7 @@ protected virtual void LoadRenderers()
 					continue;
 
 				Page page = null;
-				if(!createdPages.TryGetValue(item, out page))
+				if (!createdPages.TryGetValue(item, out page))
 				{
 					page = ((IShellContentController)item).GetOrCreateContent();
 					contentItems = ShellSectionController.GetItems();
@@ -388,7 +388,7 @@ void RemoveNonVisibleRenderers()
 					}
 				}
 
-				if(removeMe != null)
+				if (removeMe != null)
 				{
 					foreach (var remove in removeMe)
 						_renderers.Remove(remove);
@@ -437,7 +437,7 @@ protected virtual void UpdateHeaderVisibility()
 
 		void UpdateFlowDirection()
 		{
-			if(_shellContext?.Shell?.CurrentItem?.CurrentItem == ShellSection)
+			if (_shellContext?.Shell?.CurrentItem?.CurrentItem == ShellSection)
 				this.View.UpdateFlowDirection(_shellContext.Shell);
 		}
 
@@ -465,7 +465,7 @@ void OnShellSectionItemsChanged(object sender, NotifyCollectionChangedEventArgs
 
 					if (e.OldStartingIndex < _currentIndex)
 						_currentIndex--;
-					
+
 					_renderers.Remove(oldItem);
 					oldRenderer.NativeView.RemoveFromSuperview();
 					oldRenderer.ViewController.RemoveFromParentViewController();
@@ -491,7 +491,7 @@ void OnShellSectionItemsChanged(object sender, NotifyCollectionChangedEventArgs
 		IVisualElementRenderer SetPageRenderer(Page page, ShellContent shellContent)
 		{
 			var oldRenderer = Platform.GetRenderer(page);
-			if(oldRenderer != null)
+			if (oldRenderer != null)
 				oldRenderer?.Dispose();
 
 			var renderer = Platform.CreateRenderer(page);
diff --git a/src/Compatibility/Core/src/iOS/Renderers/ShellTableViewController.cs b/src/Compatibility/Core/src/iOS/Renderers/ShellTableViewController.cs
index eedabcd8bd6d..65336bd71b0c 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/ShellTableViewController.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/ShellTableViewController.cs
@@ -1,9 +1,9 @@
+using System;
+using System.Collections.Specialized;
+using System.ComponentModel;
 using CoreAnimation;
 using CoreGraphics;
-using System;
 using UIKit;
-using System.ComponentModel;
-using System.Collections.Specialized;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {
@@ -67,11 +67,11 @@ void OnFlyoutItemsChanged(object sender, EventArgs e)
 			ShellFlyoutContentManager.UpdateVerticalScrollMode();
 		}
 
-		public void LayoutParallax() => 		
+		public void LayoutParallax() =>
 			ShellFlyoutContentManager.LayoutParallax();
 
 		public override void ViewDidLoad()
-		{			
+		{
 			base.ViewDidLoad();
 
 			TableView.SeparatorStyle = UITableViewCellSeparatorStyle.None;
diff --git a/src/Compatibility/Core/src/iOS/Renderers/ShellTableViewSource.cs b/src/Compatibility/Core/src/iOS/Renderers/ShellTableViewSource.cs
index b0e3eca5e11d..abf6023a4820 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/ShellTableViewSource.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/ShellTableViewSource.cs
@@ -1,8 +1,8 @@
-using Foundation;
 using System;
 using System.Collections.Generic;
-using UIKit;
+using Foundation;
 using Microsoft.Maui.Controls.Internals;
+using UIKit;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {
@@ -66,10 +66,10 @@ internal void ReSyncCache()
 
 			foreach (var group in newGroups)
 			{
-				foreach(var element in group)
+				foreach (var element in group)
 				{
 					UIContainerCell result;
-					if(oldList.TryGetValue(element, out result))
+					if (oldList.TryGetValue(element, out result))
 					{
 						_cells.Add(element, result);
 						oldList.Remove(element);
@@ -86,7 +86,7 @@ public void ClearCache()
 		{
 			var newGroups = ((IShellController)_context.Shell).GenerateFlyoutGrouping();
 
-			if(newGroups != _groups)
+			if (newGroups != _groups)
 			{
 				_groups = newGroups;
 				if (_cells != null)
diff --git a/src/Compatibility/Core/src/iOS/Renderers/SlideFlyoutTransition.cs b/src/Compatibility/Core/src/iOS/Renderers/SlideFlyoutTransition.cs
index afb42fe6e74a..9ebf95c7edc9 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/SlideFlyoutTransition.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/SlideFlyoutTransition.cs
@@ -1,5 +1,5 @@
-using CoreGraphics;
 using System;
+using CoreGraphics;
 using UIKit;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
@@ -38,7 +38,7 @@ public virtual void LayoutViews(CGRect bounds, nfloat openPercent, UIView flyout
 				flyoutWidth = (nfloat)(Math.Min(bounds.Width, bounds.Height) * 0.8);
 
 			if (Height == -1d)
-				flyoutHeight = bounds.Height;	
+				flyoutHeight = bounds.Height;
 			else
 				flyoutHeight = (nfloat)Height;
 
@@ -52,7 +52,7 @@ public virtual void LayoutViews(CGRect bounds, nfloat openPercent, UIView flyout
 
 			var shellWidth = shell.Frame.Width;
 
-			if(shell.SemanticContentAttribute == UISemanticContentAttribute.ForceRightToLeft)
+			if (shell.SemanticContentAttribute == UISemanticContentAttribute.ForceRightToLeft)
 			{
 				var positionY = shellWidth - openPixels;
 				flyout.Frame = new CGRect(positionY, 0, flyoutWidth, flyoutHeight);
diff --git a/src/Compatibility/Core/src/iOS/Renderers/SliderRenderer.cs b/src/Compatibility/Core/src/iOS/Renderers/SliderRenderer.cs
index 07cd6d058689..3785248e6126 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/SliderRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/SliderRenderer.cs
@@ -1,8 +1,8 @@
 using System;
 using System.ComponentModel;
+using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
 using UIKit;
 using SizeF = CoreGraphics.CGSize;
-using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
 using Specifics = Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific.Slider;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
diff --git a/src/Compatibility/Core/src/iOS/Renderers/StepperRenderer.cs b/src/Compatibility/Core/src/iOS/Renderers/StepperRenderer.cs
index e9bdca0ef9ef..00ba99b80f1a 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/StepperRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/StepperRenderer.cs
@@ -1,6 +1,6 @@
 using System;
-using System.Drawing;
 using System.ComponentModel;
+using System.Drawing;
 using UIKit;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
@@ -8,7 +8,7 @@ namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 	public class StepperRenderer : ViewRenderer<Stepper, UIStepper>
 	{
 		bool _disposed;
-	
+
 		[Microsoft.Maui.Controls.Internals.Preserve(Conditional = true)]
 		public StepperRenderer()
 		{
@@ -23,7 +23,7 @@ protected override void Dispose(bool disposing)
 
 			_disposed = true;
 
-			if(disposing)
+			if (disposing)
 			{
 				if (Control != null)
 					Control.ValueChanged -= OnValueChanged;
diff --git a/src/Compatibility/Core/src/iOS/Renderers/SwipeViewRenderer.cs b/src/Compatibility/Core/src/iOS/Renderers/SwipeViewRenderer.cs
index 705a575a22d9..15cbe78eb3dc 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/SwipeViewRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/SwipeViewRenderer.cs
@@ -4,11 +4,12 @@
 using System.Linq;
 using CoreGraphics;
 using Foundation;
-using UIKit;
 using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
-using Specifics = Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific.SwipeView;
 using Microsoft.Maui.Graphics;
+using UIKit;
+using Specifics = Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific.SwipeView;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {
diff --git a/src/Compatibility/Core/src/iOS/Renderers/TabbedRenderer.cs b/src/Compatibility/Core/src/iOS/Renderers/TabbedRenderer.cs
index 475ae9849840..f4a5bdd6939c 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/TabbedRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/TabbedRenderer.cs
@@ -3,13 +3,14 @@
 using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Threading.Tasks;
-using UIKit;
 using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Controls.Platform;
+using Microsoft.Maui.Graphics;
+using UIKit;
 using static Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific.Page;
 using PageUIStatusBarAnimation = Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific.UIStatusBarAnimation;
 using TabbedPageConfiguration = Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific.TabbedPage;
 using TranslucencyMode = Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific.TranslucencyMode;
-using Microsoft.Maui.Graphics;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {
@@ -369,7 +370,7 @@ void UpdateBarBackgroundColor()
 
 			if (!isDefaultColor)
 				_barBackgroundColorWasSet = true;
-			
+
 			TabBar.BarTintColor = isDefaultColor ? _defaultBarColor : barBackgroundColor.ToUIColor();
 		}
 
@@ -409,13 +410,9 @@ void UpdateBarTextColor()
 			else
 				tabBarTextColor = barTextColor.ToUIColor();
 
-#if MACCATALYST
-			var attributes = new UIStringAttributes();
-			attributes.ForegroundColor = tabBarTextColor;
-#else
+
 			var attributes = new UITextAttributes();
 			attributes.TextColor = tabBarTextColor;
-#endif
 
 			foreach (UITabBarItem item in TabBar.Items)
 			{
@@ -475,7 +472,7 @@ void IEffectControlProvider.RegisterEffect(Effect effect)
 		async void SetTabBarItem(IVisualElementRenderer renderer)
 		{
 			var page = renderer.Element as Page;
-			if(page == null)
+			if (page == null)
 				throw new InvalidCastException($"{nameof(renderer)} must be a {nameof(Page)} renderer.");
 
 			var icons = await GetIcon(page);
diff --git a/src/Compatibility/Core/src/iOS/Renderers/TableViewModelRenderer.cs b/src/Compatibility/Core/src/iOS/Renderers/TableViewModelRenderer.cs
index 5bd6a33a1773..1900cea80175 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/TableViewModelRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/TableViewModelRenderer.cs
@@ -149,9 +149,11 @@ public override nfloat GetHeightForRow(UITableView tableView, NSIndexPath indexP
 			var cell = View.Model.GetCell(indexPath.Section, indexPath.Row);
 			var h = cell.Height;
 
-			if (View.RowHeight == -1 && h == -1 && cell is ViewCell) {
+			if (View.RowHeight == -1 && h == -1 && cell is ViewCell)
+			{
 				return UITableView.AutomaticDimension;
-			} else if (h == -1)
+			}
+			else if (h == -1)
 				return tableView.RowHeight;
 			return (nfloat)h;
 		}
diff --git a/src/Compatibility/Core/src/iOS/Renderers/TableViewRenderer.cs b/src/Compatibility/Core/src/iOS/Renderers/TableViewRenderer.cs
index 83628b101cdf..17107954b7c7 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/TableViewRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/TableViewRenderer.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.ComponentModel;
+using Microsoft.Maui.Controls.Platform;
 using UIKit;
 using RectangleF = CoreGraphics.CGRect;
 
@@ -158,18 +159,23 @@ void UpdateBackgroundView()
 		void UpdateRowHeight()
 		{
 			var rowHeight = Element.RowHeight;
-			if (Element.HasUnevenRows && rowHeight == -1) {
+			if (Element.HasUnevenRows && rowHeight == -1)
+			{
 				Control.RowHeight = UITableView.AutomaticDimension;
-			} else
+			}
+			else
 				Control.RowHeight = rowHeight <= 0 ? DefaultRowHeight : rowHeight;
 		}
 
 		void UpdateEstimatedRowHeight()
 		{
 			var rowHeight = Element.RowHeight;
-			if (Element.HasUnevenRows && rowHeight == -1) {
+			if (Element.HasUnevenRows && rowHeight == -1)
+			{
 				Control.EstimatedRowHeight = DefaultRowHeight;
-			} else {
+			}
+			else
+			{
 				Control.EstimatedRowHeight = 0;
 			}
 		}
diff --git a/src/Compatibility/Core/src/iOS/Renderers/TabletFlyoutPageRenderer.cs b/src/Compatibility/Core/src/iOS/Renderers/TabletFlyoutPageRenderer.cs
index 49a02f0767c5..4665f77c6370 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/TabletFlyoutPageRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/TabletFlyoutPageRenderer.cs
@@ -2,6 +2,7 @@
 using System.ComponentModel;
 using CoreGraphics;
 using Foundation;
+using Microsoft.Maui.Controls.Platform;
 using Microsoft.Maui.Graphics;
 using UIKit;
 
diff --git a/src/Compatibility/Core/src/iOS/Renderers/TabletShellFlyoutRenderer.cs b/src/Compatibility/Core/src/iOS/Renderers/TabletShellFlyoutRenderer.cs
index 2b99658d1b33..02438b8bbdff 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/TabletShellFlyoutRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/TabletShellFlyoutRenderer.cs
@@ -15,7 +15,7 @@ public class TabletShellFlyoutRenderer : UISplitViewController, IShellFlyoutRend
 
 		void IShellFlyoutRenderer.AttachFlyout(IShellContext context, UIViewController content)
 		{
-			if(_context != null)
+			if (_context != null)
 				_context.Shell.PropertyChanged -= HandleShellPropertyChanged;
 
 			_context = context;
@@ -26,7 +26,7 @@ void IShellFlyoutRenderer.AttachFlyout(IShellContext context, UIViewController c
 			FlyoutContent.WillDisappear += OnFlyoutContentWillDisappear;
 
 			((IShellController)_context.Shell).AddFlyoutBehaviorObserver(this);
-		
+
 			ViewControllers = new UIViewController[]
 			{
 				FlyoutContent.ViewController,
diff --git a/src/Compatibility/Core/src/iOS/Renderers/TimePickerRenderer.cs b/src/Compatibility/Core/src/iOS/Renderers/TimePickerRenderer.cs
index 154d8dd98477..906eca52025f 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/TimePickerRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/TimePickerRenderer.cs
@@ -3,10 +3,10 @@
 using System.Globalization;
 using System.Linq;
 using Foundation;
-using UIKit;
 using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
-using RectangleF = CoreGraphics.CGRect;
 using Microsoft.Maui.Platform.iOS;
+using UIKit;
+using RectangleF = CoreGraphics.CGRect;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {
@@ -214,7 +214,7 @@ void UpdateTime()
 							  .Where(c => c.Name.EndsWith("-" + iOSLocale)).FirstOrDefault();
 			if (cultureInfos == null)
 				cultureInfos = CultureInfo.InvariantCulture;
-			
+
 			if (String.IsNullOrEmpty(Element.Format))
 			{
 				string timeformat = cultureInfos.DateTimeFormat.ShortTimePattern;
diff --git a/src/Compatibility/Core/src/iOS/Renderers/UIContainerView.cs b/src/Compatibility/Core/src/iOS/Renderers/UIContainerView.cs
index c58d9700548d..2fd239026f95 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/UIContainerView.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/UIContainerView.cs
@@ -54,7 +54,7 @@ internal bool MeasureIfNeeded()
 				ReMeasure();
 				return true;
 			}
-			
+
 			return false;
 		}
 
@@ -65,7 +65,7 @@ public virtual Thickness Margin
 
 		void ReMeasure()
 		{
-			if(Height != null && MatchHeight)
+			if (Height != null && MatchHeight)
 			{
 				MeasuredHeight = Height.Value;
 			}
diff --git a/src/Compatibility/Core/src/iOS/Renderers/WkWebViewRenderer.cs b/src/Compatibility/Core/src/iOS/Renderers/WkWebViewRenderer.cs
index 64e7c7d50110..e73b2c0f74d4 100644
--- a/src/Compatibility/Core/src/iOS/Renderers/WkWebViewRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Renderers/WkWebViewRenderer.cs
@@ -9,13 +9,13 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Foundation;
+using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Graphics;
 using ObjCRuntime;
 using UIKit;
 using WebKit;
-using Microsoft.Maui.Controls.Internals;
 using PreserveAttribute = Foundation.PreserveAttribute;
 using Uri = System.Uri;
-using Microsoft.Maui.Graphics;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {
@@ -45,7 +45,7 @@ public WkWebViewRenderer() : this(CreateConfiguration())
 		[Preserve(Conditional = true)]
 		public WkWebViewRenderer(WKWebViewConfiguration config) : base(CoreGraphics.CGRect.Empty, config)
 		{
-		
+
 		}
 
 		// https://developer.apple.com/forums/thread/99674
@@ -173,7 +173,7 @@ public async void LoadUrl(string url)
 		{
 			try
 			{
-				
+
 				var uri = new Uri(url);
 
 				var safeHostUri = new Uri($"{uri.Scheme}://{uri.Authority}", UriKind.Absolute);
diff --git a/src/Compatibility/Core/src/iOS/Resources/StringResources.fr.resx b/src/Compatibility/Core/src/iOS/Resources/StringResources.fr.resx
index 819845a0e5b7..f43fa4140d29 100644
--- a/src/Compatibility/Core/src/iOS/Resources/StringResources.fr.resx
+++ b/src/Compatibility/Core/src/iOS/Resources/StringResources.fr.resx
@@ -122,7 +122,7 @@
     <comment>ContextActionCell Cancel button</comment>
   </data>
   <data name="More" xml:space="preserve">
-    <value>Options</value>
+    <value>Plus</value>
     <comment>ContextActionCell More button</comment>
   </data>
 </root>
\ No newline at end of file
diff --git a/src/Compatibility/Core/src/iOS/Resources/StringResources.it.resx b/src/Compatibility/Core/src/iOS/Resources/StringResources.it.resx
index e7b49e093e63..7fa093bef882 100644
--- a/src/Compatibility/Core/src/iOS/Resources/StringResources.it.resx
+++ b/src/Compatibility/Core/src/iOS/Resources/StringResources.it.resx
@@ -122,7 +122,7 @@
     <comment>ContextActionCell Cancel button</comment>
   </data>
   <data name="More" xml:space="preserve">
-    <value>Altro</value>
+    <value>Più</value>
     <comment>ContextActionCell More button</comment>
   </data>
 </root>
\ No newline at end of file
diff --git a/src/Compatibility/Core/src/iOS/Resources/StringResources.ja.resx b/src/Compatibility/Core/src/iOS/Resources/StringResources.ja.resx
index aa6ed1a4df4b..1416ed60858e 100644
--- a/src/Compatibility/Core/src/iOS/Resources/StringResources.ja.resx
+++ b/src/Compatibility/Core/src/iOS/Resources/StringResources.ja.resx
@@ -122,7 +122,7 @@
     <comment>ContextActionCell Cancel button</comment>
   </data>
   <data name="More" xml:space="preserve">
-    <value>その他</value>
+    <value>表示を増やす</value>
     <comment>ContextActionCell More button</comment>
   </data>
 </root>
\ No newline at end of file
diff --git a/src/Compatibility/Core/src/iOS/Resources/StringResources.ko.resx b/src/Compatibility/Core/src/iOS/Resources/StringResources.ko.resx
index 2a2de740e4ac..be63cf869026 100644
--- a/src/Compatibility/Core/src/iOS/Resources/StringResources.ko.resx
+++ b/src/Compatibility/Core/src/iOS/Resources/StringResources.ko.resx
@@ -122,7 +122,7 @@
     <comment>ContextActionCell Cancel button</comment>
   </data>
   <data name="More" xml:space="preserve">
-    <value>기타</value>
+    <value>자세히</value>
     <comment>ContextActionCell More button</comment>
   </data>
 </root>
\ No newline at end of file
diff --git a/src/Compatibility/Core/src/iOS/Resources/StringResources.ru.resx b/src/Compatibility/Core/src/iOS/Resources/StringResources.ru.resx
index 6789a97f6f75..ab8ce04ff490 100644
--- a/src/Compatibility/Core/src/iOS/Resources/StringResources.ru.resx
+++ b/src/Compatibility/Core/src/iOS/Resources/StringResources.ru.resx
@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Cancel" xml:space="preserve">
-    <value>Oтменить</value>
+    <value>Отмена</value>
     <comment>ContextActionCell Cancel button</comment>
   </data>
   <data name="More" xml:space="preserve">
diff --git a/src/Compatibility/Core/src/iOS/Resources/StringResources.tr.resx b/src/Compatibility/Core/src/iOS/Resources/StringResources.tr.resx
index 256919f4abdd..306b26e17087 100644
--- a/src/Compatibility/Core/src/iOS/Resources/StringResources.tr.resx
+++ b/src/Compatibility/Core/src/iOS/Resources/StringResources.tr.resx
@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Cancel" xml:space="preserve">
-    <value>Vazgeç</value>
+    <value>İptal</value>
     <comment>ContextActionCell Cancel button</comment>
   </data>
   <data name="More" xml:space="preserve">
diff --git a/src/Compatibility/Core/src/iOS/ResourcesProvider.cs b/src/Compatibility/Core/src/iOS/ResourcesProvider.cs
index 409a86a72db0..17a2d9643dac 100644
--- a/src/Compatibility/Core/src/iOS/ResourcesProvider.cs
+++ b/src/Compatibility/Core/src/iOS/ResourcesProvider.cs
@@ -1,11 +1,10 @@
 #if __MOBILE__
-using UIKit;
 using Microsoft.Maui.Controls.Internals;
+using UIKit;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 #else
 
-using Microsoft.Maui.Controls.Compatibility.Internals;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.MacOS
 #endif
diff --git a/src/Compatibility/Core/src/iOS/ShadowEffect.cs b/src/Compatibility/Core/src/iOS/ShadowEffect.cs
index 4fd1c7eeae9b..d948678b1dda 100644
--- a/src/Compatibility/Core/src/iOS/ShadowEffect.cs
+++ b/src/Compatibility/Core/src/iOS/ShadowEffect.cs
@@ -1,9 +1,9 @@
 using System;
 using System.ComponentModel;
-using UIKit;
 using Microsoft.Maui.Controls.Internals;
-using PlatformElement = Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific.VisualElement;
 using Microsoft.Maui.Graphics;
+using UIKit;
+using PlatformElement = Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific.VisualElement;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {
diff --git a/src/Compatibility/Core/src/iOS/Shapes/EllipseRenderer.cs b/src/Compatibility/Core/src/iOS/Shapes/EllipseRenderer.cs
index 99fce51a7ec1..7a641480d8ab 100644
--- a/src/Compatibility/Core/src/iOS/Shapes/EllipseRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Shapes/EllipseRenderer.cs
@@ -7,37 +7,37 @@ namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 namespace Microsoft.Maui.Controls.Compatibility.Platform.MacOS
 #endif
 {
-    public class EllipseRenderer : ShapeRenderer<Ellipse, EllipseView>
-    {
-        [Microsoft.Maui.Controls.Internals.Preserve(Conditional = true)]
-        public EllipseRenderer()
-        {
+	public class EllipseRenderer : ShapeRenderer<Ellipse, EllipseView>
+	{
+		[Microsoft.Maui.Controls.Internals.Preserve(Conditional = true)]
+		public EllipseRenderer()
+		{
 
-        }
+		}
 
-        protected override void OnElementChanged(ElementChangedEventArgs<Ellipse> args)
-        {
-            if (Control == null && args.NewElement != null)
-            {
-                SetNativeControl(new EllipseView());
-            }
+		protected override void OnElementChanged(ElementChangedEventArgs<Ellipse> args)
+		{
+			if (Control == null && args.NewElement != null)
+			{
+				SetNativeControl(new EllipseView());
+			}
 
-            base.OnElementChanged(args);
-        }
-    }
+			base.OnElementChanged(args);
+		}
+	}
 
-    public class EllipseView : ShapeView
-    {
-        public EllipseView()
-        {
-            UpdateShape();
-        }
+	public class EllipseView : ShapeView
+	{
+		public EllipseView()
+		{
+			UpdateShape();
+		}
 
-        void UpdateShape()
-        {
+		void UpdateShape()
+		{
 			var path = new CGPath();
-            path.AddEllipseInRect(new CGRect(0, 0, 1, 1));
-            ShapeLayer.UpdateShape(path);
-        }
-    }
+			path.AddEllipseInRect(new CGRect(0, 0, 1, 1));
+			ShapeLayer.UpdateShape(path);
+		}
+	}
 }
\ No newline at end of file
diff --git a/src/Compatibility/Core/src/iOS/Shapes/LineRenderer.cs b/src/Compatibility/Core/src/iOS/Shapes/LineRenderer.cs
index 415308c26a24..e40f63a2d045 100644
--- a/src/Compatibility/Core/src/iOS/Shapes/LineRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Shapes/LineRenderer.cs
@@ -9,101 +9,101 @@ namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 namespace Microsoft.Maui.Controls.Compatibility.Platform.MacOS
 #endif
 {
-    public class LineRenderer : ShapeRenderer<Line, LineView>
-    {
-        [Microsoft.Maui.Controls.Internals.Preserve(Conditional = true)]
-        public LineRenderer()
-        {
-
-        }
-
-        protected override void OnElementChanged(ElementChangedEventArgs<Line> args)
-        {
-            if (Control == null && args.NewElement != null)
-            {
-                SetNativeControl(new LineView());
-            }
-
-            base.OnElementChanged(args);
-
-            if (args.NewElement != null)
-            {
-                UpdateX1();
-                UpdateY1();
-                UpdateX2();
-                UpdateY2();
-            }
-        }
-
-        protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs args)
-        {
-            base.OnElementPropertyChanged(sender, args);
-
-            if (args.PropertyName == Line.X1Property.PropertyName)
-                UpdateX1();
-            else if (args.PropertyName == Line.Y1Property.PropertyName)
-                UpdateY1();
-            else if (args.PropertyName == Line.X2Property.PropertyName)
-                UpdateX2();
-            else if (args.PropertyName == Line.Y2Property.PropertyName)
-                UpdateY2();
-        }
-
-        void UpdateX1()
-        {
-            Control.UpdateX1(Element.X1);
-        }
-
-        void UpdateY1()
-        {
-            Control.UpdateY1(Element.Y1);
-        }
-
-        void UpdateX2()
-        {
-            Control.UpdateX2(Element.X2);
-        }
-
-        void UpdateY2()
-        {
-            Control.UpdateY2(Element.Y2);
-        }
-    }
-
-    public class LineView : ShapeView
-    {
-        nfloat _x1, _y1, _x2, _y2;
-
-        public void UpdateX1(double x1)
-        {
-            _x1 = new nfloat(x1);
-            UpdateShape();
-        }
-
-        public void UpdateY1(double y1)
-        {
-            _y1 = new nfloat(y1);
-            UpdateShape();
-        }
-
-        public void UpdateX2(double x2)
-        {
-            _x2 = new nfloat(x2);
-            UpdateShape();
-        }
-
-        public void UpdateY2(double y2)
-        {
-            _y2 = new nfloat(y2);
-            UpdateShape();
-        }
-
-        void UpdateShape()
-        {
+	public class LineRenderer : ShapeRenderer<Line, LineView>
+	{
+		[Microsoft.Maui.Controls.Internals.Preserve(Conditional = true)]
+		public LineRenderer()
+		{
+
+		}
+
+		protected override void OnElementChanged(ElementChangedEventArgs<Line> args)
+		{
+			if (Control == null && args.NewElement != null)
+			{
+				SetNativeControl(new LineView());
+			}
+
+			base.OnElementChanged(args);
+
+			if (args.NewElement != null)
+			{
+				UpdateX1();
+				UpdateY1();
+				UpdateX2();
+				UpdateY2();
+			}
+		}
+
+		protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs args)
+		{
+			base.OnElementPropertyChanged(sender, args);
+
+			if (args.PropertyName == Line.X1Property.PropertyName)
+				UpdateX1();
+			else if (args.PropertyName == Line.Y1Property.PropertyName)
+				UpdateY1();
+			else if (args.PropertyName == Line.X2Property.PropertyName)
+				UpdateX2();
+			else if (args.PropertyName == Line.Y2Property.PropertyName)
+				UpdateY2();
+		}
+
+		void UpdateX1()
+		{
+			Control.UpdateX1(Element.X1);
+		}
+
+		void UpdateY1()
+		{
+			Control.UpdateY1(Element.Y1);
+		}
+
+		void UpdateX2()
+		{
+			Control.UpdateX2(Element.X2);
+		}
+
+		void UpdateY2()
+		{
+			Control.UpdateY2(Element.Y2);
+		}
+	}
+
+	public class LineView : ShapeView
+	{
+		nfloat _x1, _y1, _x2, _y2;
+
+		public void UpdateX1(double x1)
+		{
+			_x1 = new nfloat(x1);
+			UpdateShape();
+		}
+
+		public void UpdateY1(double y1)
+		{
+			_y1 = new nfloat(y1);
+			UpdateShape();
+		}
+
+		public void UpdateX2(double x2)
+		{
+			_x2 = new nfloat(x2);
+			UpdateShape();
+		}
+
+		public void UpdateY2(double y2)
+		{
+			_y2 = new nfloat(y2);
+			UpdateShape();
+		}
+
+		void UpdateShape()
+		{
 			var path = new CGPath();
-            path.MoveToPoint(_x1, _y1);
-            path.AddLineToPoint(_x2, _y2);
-            ShapeLayer.UpdateShape(path);
-        }
-    }
+			path.MoveToPoint(_x1, _y1);
+			path.AddLineToPoint(_x2, _y2);
+			ShapeLayer.UpdateShape(path);
+		}
+	}
 }
\ No newline at end of file
diff --git a/src/Compatibility/Core/src/iOS/Shapes/PathRenderer.cs b/src/Compatibility/Core/src/iOS/Shapes/PathRenderer.cs
index 915c1abc2949..9d866ca73cac 100644
--- a/src/Compatibility/Core/src/iOS/Shapes/PathRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Shapes/PathRenderer.cs
@@ -8,55 +8,55 @@ namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 namespace Microsoft.Maui.Controls.Compatibility.Platform.MacOS
 #endif
 {
-    public class PathRenderer : ShapeRenderer<Path, PathView>
-    {
-        [Microsoft.Maui.Controls.Internals.Preserve(Conditional = true)]
-        public PathRenderer()
-        {
-
-        }
-
-        protected override void OnElementChanged(ElementChangedEventArgs<Path> args)
-        {
-            if (Control == null && args.NewElement != null)
-            {
-                SetNativeControl(new PathView());
-            }
-
-            base.OnElementChanged(args);
-
-            if (args.NewElement != null)
-            {
-                UpdatePath();
-            }
-        }
-
-        protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs args)
-        {
-            base.OnElementPropertyChanged(sender, args);
-
-            if (args.PropertyName == Path.DataProperty.PropertyName || args.PropertyName == Path.RenderTransformProperty.PropertyName)
-                UpdatePath();
-        }
-
-        void UpdatePath()
-        {
-            Control.UpdatePath(Element.Data.ToCGPath(Element.RenderTransform));
-        }
-    }
+	public class PathRenderer : ShapeRenderer<Path, PathView>
+	{
+		[Microsoft.Maui.Controls.Internals.Preserve(Conditional = true)]
+		public PathRenderer()
+		{
+
+		}
+
+		protected override void OnElementChanged(ElementChangedEventArgs<Path> args)
+		{
+			if (Control == null && args.NewElement != null)
+			{
+				SetNativeControl(new PathView());
+			}
+
+			base.OnElementChanged(args);
+
+			if (args.NewElement != null)
+			{
+				UpdatePath();
+			}
+		}
+
+		protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs args)
+		{
+			base.OnElementPropertyChanged(sender, args);
+
+			if (args.PropertyName == Path.DataProperty.PropertyName || args.PropertyName == Path.RenderTransformProperty.PropertyName)
+				UpdatePath();
+		}
+
+		void UpdatePath()
+		{
+			Control.UpdatePath(Element.Data.ToCGPath(Element.RenderTransform));
+		}
+	}
 
 	public class PathData
-    {
-        public CGPath Data { get; set; }
-        public bool IsNonzeroFillRule { get; set; }
-    }
-
-    public class PathView : ShapeView
-    {
-        public void UpdatePath(PathData path)
-        {
-            ShapeLayer.UpdateShape(path.Data);
-            ShapeLayer.UpdateFillMode(path != null && path.IsNonzeroFillRule);
-        }
-    }
+	{
+		public CGPath Data { get; set; }
+		public bool IsNonzeroFillRule { get; set; }
+	}
+
+	public class PathView : ShapeView
+	{
+		public void UpdatePath(PathData path)
+		{
+			ShapeLayer.UpdateShape(path.Data);
+			ShapeLayer.UpdateFillMode(path != null && path.IsNonzeroFillRule);
+		}
+	}
 }
\ No newline at end of file
diff --git a/src/Compatibility/Core/src/iOS/Shapes/PolygonRenderer.cs b/src/Compatibility/Core/src/iOS/Shapes/PolygonRenderer.cs
index 116678d61836..43837d393fa1 100644
--- a/src/Compatibility/Core/src/iOS/Shapes/PolygonRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Shapes/PolygonRenderer.cs
@@ -9,96 +9,96 @@ namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 namespace Microsoft.Maui.Controls.Compatibility.Platform.MacOS
 #endif
 {
-    public class PolygonRenderer : ShapeRenderer<Polygon, PolygonView>
-    {
-        PointCollection _points;
-
-        [Microsoft.Maui.Controls.Internals.Preserve(Conditional = true)]
-        public PolygonRenderer()
-        {
-
-        }
-
-        protected override void OnElementChanged(ElementChangedEventArgs<Polygon> args)
-        {
-            if (Control == null && args.NewElement != null)
-            {
-                SetNativeControl(new PolygonView());
-            }
-
-            base.OnElementChanged(args);
-
-            if (args.NewElement != null)
-            {
-                var points = args.NewElement.Points;
-                points.CollectionChanged += OnCollectionChanged;
-
-                UpdatePoints();
-                UpdateFillRule();
-            }
-        }
-
-        protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs args)
-        {
-            base.OnElementPropertyChanged(sender, args);
-
-            if (args.PropertyName == Polygon.PointsProperty.PropertyName)
-                UpdatePoints();
-            else if (args.PropertyName == Polygon.FillRuleProperty.PropertyName)
-                UpdateFillRule();
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-
-            if (disposing)
-            {
-                if (_points != null)
-                {
-                    _points.CollectionChanged -= OnCollectionChanged;
-                    _points = null;
-                }
-            }
-        }
-
-        void UpdatePoints()
-        {
-            if (_points != null)
-                _points.CollectionChanged -= OnCollectionChanged;
-
-            _points = Element.Points;
-
-            _points.CollectionChanged += OnCollectionChanged;
-
-            Control.UpdatePoints(_points.ToCGPoints());
-        }
-
-        public void UpdateFillRule()
-        {
-            Control.UpdateFillMode(Element.FillRule == FillRule.Nonzero);
-        }
-
-        void OnCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
-        {
-            UpdatePoints();
-        }
-    }
-
-    public class PolygonView : ShapeView
-    {
-        public void UpdatePoints(CGPoint[] points)
-        {
+	public class PolygonRenderer : ShapeRenderer<Polygon, PolygonView>
+	{
+		PointCollection _points;
+
+		[Microsoft.Maui.Controls.Internals.Preserve(Conditional = true)]
+		public PolygonRenderer()
+		{
+
+		}
+
+		protected override void OnElementChanged(ElementChangedEventArgs<Polygon> args)
+		{
+			if (Control == null && args.NewElement != null)
+			{
+				SetNativeControl(new PolygonView());
+			}
+
+			base.OnElementChanged(args);
+
+			if (args.NewElement != null)
+			{
+				var points = args.NewElement.Points;
+				points.CollectionChanged += OnCollectionChanged;
+
+				UpdatePoints();
+				UpdateFillRule();
+			}
+		}
+
+		protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs args)
+		{
+			base.OnElementPropertyChanged(sender, args);
+
+			if (args.PropertyName == Polygon.PointsProperty.PropertyName)
+				UpdatePoints();
+			else if (args.PropertyName == Polygon.FillRuleProperty.PropertyName)
+				UpdateFillRule();
+		}
+
+		protected override void Dispose(bool disposing)
+		{
+			base.Dispose(disposing);
+
+			if (disposing)
+			{
+				if (_points != null)
+				{
+					_points.CollectionChanged -= OnCollectionChanged;
+					_points = null;
+				}
+			}
+		}
+
+		void UpdatePoints()
+		{
+			if (_points != null)
+				_points.CollectionChanged -= OnCollectionChanged;
+
+			_points = Element.Points;
+
+			_points.CollectionChanged += OnCollectionChanged;
+
+			Control.UpdatePoints(_points.ToCGPoints());
+		}
+
+		public void UpdateFillRule()
+		{
+			Control.UpdateFillMode(Element.FillRule == FillRule.Nonzero);
+		}
+
+		void OnCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+		{
+			UpdatePoints();
+		}
+	}
+
+	public class PolygonView : ShapeView
+	{
+		public void UpdatePoints(CGPoint[] points)
+		{
 			var path = new CGPath();
-            path.AddLines(points);
-            path.CloseSubpath();
+			path.AddLines(points);
+			path.CloseSubpath();
 
-            ShapeLayer.UpdateShape(path);
-        }
+			ShapeLayer.UpdateShape(path);
+		}
 
-        public void UpdateFillMode(bool fillMode)
-        {
-            ShapeLayer.UpdateFillMode(fillMode);
-        }
-    }
+		public void UpdateFillMode(bool fillMode)
+		{
+			ShapeLayer.UpdateFillMode(fillMode);
+		}
+	}
 }
\ No newline at end of file
diff --git a/src/Compatibility/Core/src/iOS/Shapes/PolylineRenderer.cs b/src/Compatibility/Core/src/iOS/Shapes/PolylineRenderer.cs
index 7aba3ecbce7e..f4c90e426e2e 100644
--- a/src/Compatibility/Core/src/iOS/Shapes/PolylineRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Shapes/PolylineRenderer.cs
@@ -9,91 +9,91 @@ namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 namespace Microsoft.Maui.Controls.Compatibility.Platform.MacOS
 #endif
 {
-    public class PolylineRenderer : ShapeRenderer<Polyline, PolylineView>
-    {
-        PointCollection _points;
-
-        [Microsoft.Maui.Controls.Internals.Preserve(Conditional = true)]
-        public PolylineRenderer()
-        {
-
-        }
-
-        protected override void OnElementChanged(ElementChangedEventArgs<Polyline> args)
-        {
-            if (Control == null && args.NewElement != null)
-            {
-                SetNativeControl(new PolylineView());
-            }
-
-            base.OnElementChanged(args);
-
-            if (args.NewElement != null)
-            {
-                UpdatePoints();
-                UpdateFillRule();
-            }
-        }
-
-        protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs args)
-        {
-            base.OnElementPropertyChanged(sender, args);
-
-            if (args.PropertyName == Polyline.PointsProperty.PropertyName)
-                UpdatePoints();
-            else if (args.PropertyName == Polyline.FillRuleProperty.PropertyName)
-                UpdateFillRule();
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            base.Dispose(disposing);
-
-            if (disposing)
-            {
-                if (_points != null)
-                {
-                    _points.CollectionChanged -= OnCollectionChanged;
-                    _points = null;
-                }
-            }
-        }
-
-        void UpdatePoints()
-        {
-            if (_points != null)
-                _points.CollectionChanged -= OnCollectionChanged;
-
-            _points = Element.Points;
-
-            _points.CollectionChanged += OnCollectionChanged;
-
-            Control.UpdatePoints(_points.ToCGPoints());
-        }
-
-        public void UpdateFillRule()
-        {
-            Control.UpdateFillMode(Element.FillRule == FillRule.Nonzero);
-        }
-
-        void OnCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
-        {
-            UpdatePoints();
-        }
-    }
-
-    public class PolylineView : ShapeView
-    {
-        public void UpdatePoints(CGPoint[] points)
-        {
-            var path = new CGPath();
-            path.AddLines(points);
-            ShapeLayer.UpdateShape(path);
-        }
-
-        public void UpdateFillMode(bool fillMode)
-        {
-            ShapeLayer.UpdateFillMode(fillMode);
-        }
-    }
+	public class PolylineRenderer : ShapeRenderer<Polyline, PolylineView>
+	{
+		PointCollection _points;
+
+		[Microsoft.Maui.Controls.Internals.Preserve(Conditional = true)]
+		public PolylineRenderer()
+		{
+
+		}
+
+		protected override void OnElementChanged(ElementChangedEventArgs<Polyline> args)
+		{
+			if (Control == null && args.NewElement != null)
+			{
+				SetNativeControl(new PolylineView());
+			}
+
+			base.OnElementChanged(args);
+
+			if (args.NewElement != null)
+			{
+				UpdatePoints();
+				UpdateFillRule();
+			}
+		}
+
+		protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs args)
+		{
+			base.OnElementPropertyChanged(sender, args);
+
+			if (args.PropertyName == Polyline.PointsProperty.PropertyName)
+				UpdatePoints();
+			else if (args.PropertyName == Polyline.FillRuleProperty.PropertyName)
+				UpdateFillRule();
+		}
+
+		protected override void Dispose(bool disposing)
+		{
+			base.Dispose(disposing);
+
+			if (disposing)
+			{
+				if (_points != null)
+				{
+					_points.CollectionChanged -= OnCollectionChanged;
+					_points = null;
+				}
+			}
+		}
+
+		void UpdatePoints()
+		{
+			if (_points != null)
+				_points.CollectionChanged -= OnCollectionChanged;
+
+			_points = Element.Points;
+
+			_points.CollectionChanged += OnCollectionChanged;
+
+			Control.UpdatePoints(_points.ToCGPoints());
+		}
+
+		public void UpdateFillRule()
+		{
+			Control.UpdateFillMode(Element.FillRule == FillRule.Nonzero);
+		}
+
+		void OnCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+		{
+			UpdatePoints();
+		}
+	}
+
+	public class PolylineView : ShapeView
+	{
+		public void UpdatePoints(CGPoint[] points)
+		{
+			var path = new CGPath();
+			path.AddLines(points);
+			ShapeLayer.UpdateShape(path);
+		}
+
+		public void UpdateFillMode(bool fillMode)
+		{
+			ShapeLayer.UpdateFillMode(fillMode);
+		}
+	}
 }
\ No newline at end of file
diff --git a/src/Compatibility/Core/src/iOS/Shapes/RectangleRenderer.cs b/src/Compatibility/Core/src/iOS/Shapes/RectangleRenderer.cs
index 755d54484009..331bd8018068 100644
--- a/src/Compatibility/Core/src/iOS/Shapes/RectangleRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Shapes/RectangleRenderer.cs
@@ -9,106 +9,106 @@ namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 namespace Microsoft.Maui.Controls.Compatibility.Platform.MacOS
 #endif
 {
-    public class RectangleRenderer : ShapeRenderer<FormsRectangle, RectangleView>
-    {
-        // Each corner of the rounded rectangle is one-quarter of an ellipse with axes equal to the RadiusX and Radius parameters.
-        const double MaximumRadius = 0.5d;
-
-        [Microsoft.Maui.Controls.Internals.Preserve(Conditional = true)]
-        public RectangleRenderer()
-        {
-
-        }
-
-        protected override void OnElementChanged(ElementChangedEventArgs<FormsRectangle> args)
-        {
-            if (Control == null && args.NewElement != null)
-            {
-                SetNativeControl(new RectangleView());
-            }
-
-            base.OnElementChanged(args);
-        }
-
-        protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs args)
-        {
-            base.OnElementPropertyChanged(sender, args);
-
-            if (args.PropertyName == VisualElement.HeightProperty.PropertyName || args.PropertyName == VisualElement.WidthProperty.PropertyName)
-                UpdateRadius();
-            if (args.PropertyName == FormsRectangle.RadiusXProperty.PropertyName)
-                UpdateRadiusX();
-            else if (args.PropertyName == FormsRectangle.RadiusYProperty.PropertyName)
-                UpdateRadiusY();
-        }
-
-        void UpdateRadius()
-        {
-            UpdateRadiusX();
-            UpdateRadiusY();
-        }
-
-        void UpdateRadiusX()
-        {
-            if (Element.Width > 0)
-            {
-                var radiusX = ValidateRadius(Element.RadiusX / Element.Width);
-                Control.UpdateRadiusX(radiusX);
-            }
-        }
-
-        void UpdateRadiusY()
-        {
-            if (Element.Height > 0)
-            {
-                var radiusY = ValidateRadius(Element.RadiusY / Element.Height);
-                Control.UpdateRadiusY(radiusY);
-            }
-        }
-
-        double ValidateRadius(double radius)
-        {
-            if (radius > MaximumRadius)
-                radius = MaximumRadius;
-
-            return radius;
-        }
-    }
-
-    public class RectangleView : ShapeView
-    {
-        public RectangleView()
-        {
-            UpdateShape();
-        }
-
-        public nfloat RadiusX { set; get; }
-
-        public nfloat RadiusY { set; get; }
-
-        void UpdateShape()
-        {
+	public class RectangleRenderer : ShapeRenderer<FormsRectangle, RectangleView>
+	{
+		// Each corner of the rounded rectangle is one-quarter of an ellipse with axes equal to the RadiusX and Radius parameters.
+		const double MaximumRadius = 0.5d;
+
+		[Microsoft.Maui.Controls.Internals.Preserve(Conditional = true)]
+		public RectangleRenderer()
+		{
+
+		}
+
+		protected override void OnElementChanged(ElementChangedEventArgs<FormsRectangle> args)
+		{
+			if (Control == null && args.NewElement != null)
+			{
+				SetNativeControl(new RectangleView());
+			}
+
+			base.OnElementChanged(args);
+		}
+
+		protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs args)
+		{
+			base.OnElementPropertyChanged(sender, args);
+
+			if (args.PropertyName == VisualElement.HeightProperty.PropertyName || args.PropertyName == VisualElement.WidthProperty.PropertyName)
+				UpdateRadius();
+			if (args.PropertyName == FormsRectangle.RadiusXProperty.PropertyName)
+				UpdateRadiusX();
+			else if (args.PropertyName == FormsRectangle.RadiusYProperty.PropertyName)
+				UpdateRadiusY();
+		}
+
+		void UpdateRadius()
+		{
+			UpdateRadiusX();
+			UpdateRadiusY();
+		}
+
+		void UpdateRadiusX()
+		{
+			if (Element.Width > 0)
+			{
+				var radiusX = ValidateRadius(Element.RadiusX / Element.Width);
+				Control.UpdateRadiusX(radiusX);
+			}
+		}
+
+		void UpdateRadiusY()
+		{
+			if (Element.Height > 0)
+			{
+				var radiusY = ValidateRadius(Element.RadiusY / Element.Height);
+				Control.UpdateRadiusY(radiusY);
+			}
+		}
+
+		double ValidateRadius(double radius)
+		{
+			if (radius > MaximumRadius)
+				radius = MaximumRadius;
+
+			return radius;
+		}
+	}
+
+	public class RectangleView : ShapeView
+	{
+		public RectangleView()
+		{
+			UpdateShape();
+		}
+
+		public nfloat RadiusX { set; get; }
+
+		public nfloat RadiusY { set; get; }
+
+		void UpdateShape()
+		{
 			var path = new CGPath();
-            path.AddRoundedRect(new CGRect(0, 0, 1, 1), RadiusX, RadiusY);
-            ShapeLayer.UpdateShape(path);
-        }
-
-        public void UpdateRadiusX(double radiusX)
-        {
-            if (double.IsInfinity(radiusX))
-                return;
-
-            RadiusX = new nfloat(radiusX);
-            UpdateShape();
-        }
-
-        public void UpdateRadiusY(double radiusY)
-        {
-            if (double.IsInfinity(radiusY))
-                return;
-
-            RadiusY = new nfloat(radiusY);
-            UpdateShape();
-        }
-    }
+			path.AddRoundedRect(new CGRect(0, 0, 1, 1), RadiusX, RadiusY);
+			ShapeLayer.UpdateShape(path);
+		}
+
+		public void UpdateRadiusX(double radiusX)
+		{
+			if (double.IsInfinity(radiusX))
+				return;
+
+			RadiusX = new nfloat(radiusX);
+			UpdateShape();
+		}
+
+		public void UpdateRadiusY(double radiusY)
+		{
+			if (double.IsInfinity(radiusY))
+				return;
+
+			RadiusY = new nfloat(radiusY);
+			UpdateShape();
+		}
+	}
 }
\ No newline at end of file
diff --git a/src/Compatibility/Core/src/iOS/Shapes/ShapeRenderer.cs b/src/Compatibility/Core/src/iOS/Shapes/ShapeRenderer.cs
index e3819ca29ce3..c5204d15836c 100644
--- a/src/Compatibility/Core/src/iOS/Shapes/ShapeRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/Shapes/ShapeRenderer.cs
@@ -16,573 +16,573 @@ namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 namespace Microsoft.Maui.Controls.Compatibility.Platform.MacOS
 #endif
 {
-    public class ShapeRenderer<TShape, TNativeShape> : ViewRenderer<TShape, TNativeShape>
-        where TShape : Shape
-        where TNativeShape : ShapeView
-    {
-        double _height;
-        double _width;
-
-        protected override void OnElementChanged(ElementChangedEventArgs<TShape> args)
-        {
-            base.OnElementChanged(args);
-
-            if (args.NewElement != null)
-            {
-                UpdateAspect();
-                UpdateFill();
-                UpdateStroke();
-                UpdateStrokeThickness();
-                UpdateStrokeDashArray();
-                UpdateStrokeDashOffset();
-                UpdateStrokeLineCap();
-                UpdateStrokeLineJoin();
-                UpdateStrokeMiterLimit();
-
-                if (!args.NewElement.Bounds.IsEmpty)
-                {
-                    _height = Element.Height;
-                    _width = Element.Width;
-
-                    UpdateSize();
-                }
-            }
-        }
-
-        protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs args)
-        {
-            base.OnElementPropertyChanged(sender, args);
-
-            if (args.PropertyName == VisualElement.HeightProperty.PropertyName)
-            {
-                _height = Element.Height;
-                UpdateSize();
-            }
-            else if (args.PropertyName == VisualElement.WidthProperty.PropertyName)
-            {
-                _width = Element.Width;
-                UpdateSize();
-            }
-            else if (args.PropertyName == Shape.AspectProperty.PropertyName)
-                UpdateAspect();
-            else if (args.PropertyName == Shape.FillProperty.PropertyName)
-                UpdateFill();
-            else if (args.PropertyName == Shape.StrokeProperty.PropertyName)
-                UpdateStroke();
-            else if (args.PropertyName == Shape.StrokeThicknessProperty.PropertyName)
-                UpdateStrokeThickness();
-            else if (args.PropertyName == Shape.StrokeDashArrayProperty.PropertyName)
-                UpdateStrokeDashArray();
-            else if (args.PropertyName == Shape.StrokeDashOffsetProperty.PropertyName)
-                UpdateStrokeDashOffset();
-            else if (args.PropertyName == Shape.StrokeLineCapProperty.PropertyName)
-                UpdateStrokeLineCap();
-            else if (args.PropertyName == Shape.StrokeLineJoinProperty.PropertyName)
-                UpdateStrokeLineJoin();
-            else if (args.PropertyName == Shape.StrokeMiterLimitProperty.PropertyName)
-                UpdateStrokeMiterLimit();
-        }
-
-        public override SizeRequest GetDesiredSize(double widthConstraint, double heightConstraint)
-        {
-            if (Control != null)
-            {
-                return Control.ShapeLayer.GetDesiredSize();
-            }
-
-            return base.GetDesiredSize(widthConstraint, heightConstraint);
-        }
-
-        void UpdateAspect()
-        {
-            Control.ShapeLayer.UpdateAspect(Element.Aspect);
-        }
-
-        void UpdateSize()
-        {
-            Control.ShapeLayer.UpdateSize(new CGSize(new nfloat(_width), new nfloat(_height)));
-        }
-
-        void UpdateFill()
-        {
-            Control.ShapeLayer.UpdateFill(Element.Fill);
-        }
-
-        void UpdateStroke()
-        {
-            Control.ShapeLayer.UpdateStroke(Element.Stroke);
-        }
-
-        void UpdateStrokeThickness()
-        {
-            Control.ShapeLayer.UpdateStrokeThickness(Element.StrokeThickness);
-        }
-
-        void UpdateStrokeDashArray()
-        {
-            if (Element.StrokeDashArray == null || Element.StrokeDashArray.Count == 0)
-                Control.ShapeLayer.UpdateStrokeDash(new nfloat[0]);
-            else
-            {
+	public class ShapeRenderer<TShape, TNativeShape> : ViewRenderer<TShape, TNativeShape>
+		where TShape : Shape
+		where TNativeShape : ShapeView
+	{
+		double _height;
+		double _width;
+
+		protected override void OnElementChanged(ElementChangedEventArgs<TShape> args)
+		{
+			base.OnElementChanged(args);
+
+			if (args.NewElement != null)
+			{
+				UpdateAspect();
+				UpdateFill();
+				UpdateStroke();
+				UpdateStrokeThickness();
+				UpdateStrokeDashArray();
+				UpdateStrokeDashOffset();
+				UpdateStrokeLineCap();
+				UpdateStrokeLineJoin();
+				UpdateStrokeMiterLimit();
+
+				if (!args.NewElement.Bounds.IsEmpty)
+				{
+					_height = Element.Height;
+					_width = Element.Width;
+
+					UpdateSize();
+				}
+			}
+		}
+
+		protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs args)
+		{
+			base.OnElementPropertyChanged(sender, args);
+
+			if (args.PropertyName == VisualElement.HeightProperty.PropertyName)
+			{
+				_height = Element.Height;
+				UpdateSize();
+			}
+			else if (args.PropertyName == VisualElement.WidthProperty.PropertyName)
+			{
+				_width = Element.Width;
+				UpdateSize();
+			}
+			else if (args.PropertyName == Shape.AspectProperty.PropertyName)
+				UpdateAspect();
+			else if (args.PropertyName == Shape.FillProperty.PropertyName)
+				UpdateFill();
+			else if (args.PropertyName == Shape.StrokeProperty.PropertyName)
+				UpdateStroke();
+			else if (args.PropertyName == Shape.StrokeThicknessProperty.PropertyName)
+				UpdateStrokeThickness();
+			else if (args.PropertyName == Shape.StrokeDashArrayProperty.PropertyName)
+				UpdateStrokeDashArray();
+			else if (args.PropertyName == Shape.StrokeDashOffsetProperty.PropertyName)
+				UpdateStrokeDashOffset();
+			else if (args.PropertyName == Shape.StrokeLineCapProperty.PropertyName)
+				UpdateStrokeLineCap();
+			else if (args.PropertyName == Shape.StrokeLineJoinProperty.PropertyName)
+				UpdateStrokeLineJoin();
+			else if (args.PropertyName == Shape.StrokeMiterLimitProperty.PropertyName)
+				UpdateStrokeMiterLimit();
+		}
+
+		public override SizeRequest GetDesiredSize(double widthConstraint, double heightConstraint)
+		{
+			if (Control != null)
+			{
+				return Control.ShapeLayer.GetDesiredSize();
+			}
+
+			return base.GetDesiredSize(widthConstraint, heightConstraint);
+		}
+
+		void UpdateAspect()
+		{
+			Control.ShapeLayer.UpdateAspect(Element.Aspect);
+		}
+
+		void UpdateSize()
+		{
+			Control.ShapeLayer.UpdateSize(new CGSize(new nfloat(_width), new nfloat(_height)));
+		}
+
+		void UpdateFill()
+		{
+			Control.ShapeLayer.UpdateFill(Element.Fill);
+		}
+
+		void UpdateStroke()
+		{
+			Control.ShapeLayer.UpdateStroke(Element.Stroke);
+		}
+
+		void UpdateStrokeThickness()
+		{
+			Control.ShapeLayer.UpdateStrokeThickness(Element.StrokeThickness);
+		}
+
+		void UpdateStrokeDashArray()
+		{
+			if (Element.StrokeDashArray == null || Element.StrokeDashArray.Count == 0)
+				Control.ShapeLayer.UpdateStrokeDash(new nfloat[0]);
+			else
+			{
 				nfloat[] dashArray;
 				double[] array;
 
 				if (Element.StrokeDashArray.Count % 2 == 0)
 				{
 					array = new double[Element.StrokeDashArray.Count];
-                    dashArray = new nfloat[Element.StrokeDashArray.Count];
+					dashArray = new nfloat[Element.StrokeDashArray.Count];
 					Element.StrokeDashArray.CopyTo(array, 0);
 				}
 				else
 				{
 					array = new double[2 * Element.StrokeDashArray.Count];
-                    dashArray = new nfloat[2 * Element.StrokeDashArray.Count];
+					dashArray = new nfloat[2 * Element.StrokeDashArray.Count];
 					Element.StrokeDashArray.CopyTo(array, 0);
 					Element.StrokeDashArray.CopyTo(array, Element.StrokeDashArray.Count);
 				}
 
 				double thickness = Element.StrokeThickness;
 
-                for (int i = 0; i < array.Length; i++)
-                    dashArray[i] = new nfloat(thickness * array[i]);
-                
-                Control.ShapeLayer.UpdateStrokeDash(dashArray);
-            }
-        }
+				for (int i = 0; i < array.Length; i++)
+					dashArray[i] = new nfloat(thickness * array[i]);
 
-        void UpdateStrokeDashOffset()
-        {
-            Control.ShapeLayer.UpdateStrokeDashOffset((nfloat)Element.StrokeDashOffset);
-        }
+				Control.ShapeLayer.UpdateStrokeDash(dashArray);
+			}
+		}
+
+		void UpdateStrokeDashOffset()
+		{
+			Control.ShapeLayer.UpdateStrokeDashOffset((nfloat)Element.StrokeDashOffset);
+		}
 
 		void UpdateStrokeLineCap()
 		{
-            PenLineCap lineCap = Element.StrokeLineCap;
-            CGLineCap iLineCap = CGLineCap.Butt;
-
-            switch (lineCap)
-            {
-                case PenLineCap.Flat:
-                    iLineCap = CGLineCap.Butt;
-                    break;
-                case PenLineCap.Square:
-                    iLineCap = CGLineCap.Square;
-                    break;
-                case PenLineCap.Round:
-                    iLineCap = CGLineCap.Round;
-                    break;
-            }
-
-            Control.ShapeLayer.UpdateStrokeLineCap(iLineCap);
-        }
-
-        void UpdateStrokeLineJoin()
-        {
-            PenLineJoin lineJoin = Element.StrokeLineJoin;
-            CGLineJoin iLineJoin = CGLineJoin.Miter;
-
-            switch (lineJoin)
-            {
-                case PenLineJoin.Miter:
-                    iLineJoin = CGLineJoin.Miter;
-                    break;
-                case PenLineJoin.Bevel:
-                    iLineJoin = CGLineJoin.Bevel;
-                    break;
-                case PenLineJoin.Round:
-                    iLineJoin = CGLineJoin.Round;
-                    break;
-            }
-
-            Control.ShapeLayer.UpdateStrokeLineJoin(iLineJoin);
-        }
-
-        void UpdateStrokeMiterLimit()
-        {
-            Control.ShapeLayer.UpdateStrokeMiterLimit(new nfloat(Element.StrokeMiterLimit));
-        }
-    }
-
-    public class ShapeView
+			PenLineCap lineCap = Element.StrokeLineCap;
+			CGLineCap iLineCap = CGLineCap.Butt;
+
+			switch (lineCap)
+			{
+				case PenLineCap.Flat:
+					iLineCap = CGLineCap.Butt;
+					break;
+				case PenLineCap.Square:
+					iLineCap = CGLineCap.Square;
+					break;
+				case PenLineCap.Round:
+					iLineCap = CGLineCap.Round;
+					break;
+			}
+
+			Control.ShapeLayer.UpdateStrokeLineCap(iLineCap);
+		}
+
+		void UpdateStrokeLineJoin()
+		{
+			PenLineJoin lineJoin = Element.StrokeLineJoin;
+			CGLineJoin iLineJoin = CGLineJoin.Miter;
+
+			switch (lineJoin)
+			{
+				case PenLineJoin.Miter:
+					iLineJoin = CGLineJoin.Miter;
+					break;
+				case PenLineJoin.Bevel:
+					iLineJoin = CGLineJoin.Bevel;
+					break;
+				case PenLineJoin.Round:
+					iLineJoin = CGLineJoin.Round;
+					break;
+			}
+
+			Control.ShapeLayer.UpdateStrokeLineJoin(iLineJoin);
+		}
+
+		void UpdateStrokeMiterLimit()
+		{
+			Control.ShapeLayer.UpdateStrokeMiterLimit(new nfloat(Element.StrokeMiterLimit));
+		}
+	}
+
+	public class ShapeView
 #if __MOBILE__
 	: UIView
 #else
     : NSView
 #endif
-    {
-        public ShapeView()
-        {
+	{
+		public ShapeView()
+		{
 #if __MOBILE__
-            BackgroundColor = UIColor.Clear;
+			BackgroundColor = UIColor.Clear;
 #else
             WantsLayer = true;
 #endif
-            ShapeLayer = new ShapeLayer();
-            Layer.AddSublayer(ShapeLayer);
-            Layer.MasksToBounds = false;
-        }
+			ShapeLayer = new ShapeLayer();
+			Layer.AddSublayer(ShapeLayer);
+			Layer.MasksToBounds = false;
+		}
 
-        public ShapeLayer ShapeLayer
-        {
-            private set;
-            get;
-        }
+		public ShapeLayer ShapeLayer
+		{
+			private set;
+			get;
+		}
 
 #if !__MOBILE__
         public override bool IsFlipped => true;
 #endif
-    }
+	}
 
-    public class ShapeLayer : CALayer
-    {
-        CGPath _path;
-        CGRect _pathFillBounds;
-        CGRect _pathStrokeBounds;
+	public class ShapeLayer : CALayer
+	{
+		CGPath _path;
+		CGRect _pathFillBounds;
+		CGRect _pathStrokeBounds;
 
-        CGPath _renderPath;
-        CGRect _renderPathFill;
-        CGRect _renderPathStroke;
+		CGPath _renderPath;
+		CGRect _renderPathFill;
+		CGRect _renderPathStroke;
 
-        bool _fillMode;
+		bool _fillMode;
 
-        Brush _stroke;
-        Brush _fill;
+		Brush _stroke;
+		Brush _fill;
 
-        nfloat _strokeWidth;
-        nfloat[] _strokeDash;
-        nfloat _dashOffset;
+		nfloat _strokeWidth;
+		nfloat[] _strokeDash;
+		nfloat _dashOffset;
 
-        Stretch _stretch;
+		Stretch _stretch;
 
 		CGLineCap _strokeLineCap;
-        CGLineJoin _strokeLineJoin;
-        nfloat _strokeMiterLimit;
+		CGLineJoin _strokeLineJoin;
+		nfloat _strokeMiterLimit;
 
-        public ShapeLayer()
-        {
+		public ShapeLayer()
+		{
 #if __MOBILE__
-            ContentsScale = UIScreen.MainScreen.Scale;
+			ContentsScale = UIScreen.MainScreen.Scale;
 #else
             ContentsScale = NSScreen.MainScreen.BackingScaleFactor;
 #endif
-            _fillMode = false;
-            _stretch = Stretch.None;
-            _strokeLineCap = CGLineCap.Butt;
-            _strokeLineJoin = CGLineJoin.Miter;
-            _strokeMiterLimit = 10;
-        }
-
-        public override void DrawInContext(CGContext ctx)
-        {
-            base.DrawInContext(ctx);
-            RenderShape(ctx);
-        }
-
-        public void UpdateShape(CGPath path)
-        {
-            _path = path;
-
-            if (_path != null)
-                _pathFillBounds = _path.PathBoundingBox;
-            else
-                _pathFillBounds = new CGRect();
-
-            UpdatePathStrokeBounds();
-        }
-
-        public void UpdateFillMode(bool fillMode)
-        {
-            _fillMode = fillMode;
-            SetNeedsDisplay();
-        }
-
-        public SizeRequest GetDesiredSize()
-        {
-            return new SizeRequest(new Size(
-                Math.Max(0, nfloat.IsNaN(_pathStrokeBounds.Right) ? 0 : _pathStrokeBounds.Right),
-                Math.Max(0, nfloat.IsNaN(_pathStrokeBounds.Bottom) ? 0 : _pathStrokeBounds.Bottom)));
-        }
-
-        public void UpdateSize(CGSize size)
-        {
-            Bounds = new CGRect(new CGPoint(), size);
-            BuildRenderPath();
-        }
-
-        public void UpdateAspect(Stretch stretch)
-        {
-            _stretch = stretch;
-            BuildRenderPath();
-        }
-
-        public void UpdateFill(Brush fill)
-        {
-            _fill = fill;
-            SetNeedsDisplay();
-        }
-
-        public void UpdateStroke(Brush stroke)
-        {
-            _stroke = stroke;
-            SetNeedsDisplay();
-        }
-
-        public void UpdateStrokeThickness(double strokeWidth)
-        {
-            _strokeWidth = new nfloat(strokeWidth);
-            BuildRenderPath();
-        }
-
-        public void UpdateStrokeDash(nfloat[] dash)
-        {
-            _strokeDash = dash;
-            SetNeedsDisplay();
-        }
-
-        public void UpdateStrokeDashOffset(nfloat dashOffset)
-        {
-            _dashOffset = dashOffset;
-            SetNeedsDisplay();
-        }
-
-        public void UpdateStrokeLineCap(CGLineCap strokeLineCap)
-        {
-            _strokeLineCap = strokeLineCap;
-            UpdatePathStrokeBounds();
-            SetNeedsDisplay();
-        }
-
-        public void UpdateStrokeLineJoin(CGLineJoin strokeLineJoin)
-        {
-            _strokeLineJoin = strokeLineJoin;
-            UpdatePathStrokeBounds();
-            SetNeedsDisplay();
-        }
-
-        public void UpdateStrokeMiterLimit(nfloat strokeMiterLimit)
-        {
-            _strokeMiterLimit = strokeMiterLimit;
-            UpdatePathStrokeBounds();
-            SetNeedsDisplay();
-        }
-
-        void BuildRenderPath()
-        {
-            if (_path == null)
-            {
-                _renderPath = null;
-                _renderPathFill = new CGRect();
-                _renderPathStroke = new CGRect();
-                return;
-            }
-
-            CATransaction.Begin();
-            CATransaction.DisableActions = true;
-
-            if (_stretch != Stretch.None)
-            {
-                CGRect viewBounds = Bounds;
-                viewBounds.X += _strokeWidth / 2;
-                viewBounds.Y += _strokeWidth / 2;
-                viewBounds.Width -= _strokeWidth;
-                viewBounds.Height -= _strokeWidth;
-
-                nfloat widthScale = viewBounds.Width / _pathFillBounds.Width;
-                nfloat heightScale = viewBounds.Height / _pathFillBounds.Height;
-                var stretchTransform = CGAffineTransform.MakeIdentity();
-
-                switch (_stretch)
-                {
-                    case Stretch.None:
-                        break;
-
-                    case Stretch.Fill:
-                        stretchTransform.Scale(widthScale, heightScale);
-
-                        stretchTransform.Translate(
-                            viewBounds.Left - widthScale * _pathFillBounds.Left,
-                            viewBounds.Top - heightScale * _pathFillBounds.Top);
-                        break;
-
-                    case Stretch.Uniform:
-                        nfloat minScale = NMath.Min(widthScale, heightScale);
-
-                        stretchTransform.Scale(minScale, minScale);
-
-                        stretchTransform.Translate(
-                            viewBounds.Left - minScale * _pathFillBounds.Left +
-                            (viewBounds.Width - minScale * _pathFillBounds.Width) / 2,
-                            viewBounds.Top - minScale * _pathFillBounds.Top +
-                            (viewBounds.Height - minScale * _pathFillBounds.Height) / 2);
-                        break;
-
-                    case Stretch.UniformToFill:
-                        nfloat maxScale = NMath.Max(widthScale, heightScale);
-
-                        stretchTransform.Scale(maxScale, maxScale);
-
-                        stretchTransform.Translate(
-                            viewBounds.Left - maxScale * _pathFillBounds.Left,
-                            viewBounds.Top - maxScale * _pathFillBounds.Top);
-                        break;
-                }
-
-                Frame = Bounds;
-                _renderPath = _path.CopyByTransformingPath(stretchTransform);
-            }
-            else
-            {
-                nfloat adjustX = NMath.Min(0, _pathStrokeBounds.X);
-                nfloat adjustY = NMath.Min(0, _pathStrokeBounds.Y);
-
-                if (adjustX < 0 || adjustY < 0)
-                {
-                    nfloat width = Bounds.Width;
-                    nfloat height = Bounds.Height;
-
-                    if (_pathStrokeBounds.Width > Bounds.Width)
-                        width = Bounds.Width - adjustX;
-                    if (_pathStrokeBounds.Height > Bounds.Height)
-                        height = Bounds.Height - adjustY;
-
-                    Frame = new CGRect(adjustX, adjustY, width, height);
-                    var transform = new CGAffineTransform(Bounds.Width / width, 0, 0, Bounds.Height / height, -adjustX, -adjustY);
-                    _renderPath = _path.CopyByTransformingPath(transform);
-                }
-                else
-                {
-                    Frame = Bounds;
-                    _renderPath = _path.CopyByTransformingPath(CGAffineTransform.MakeIdentity());
-                }
-            }
-
-            _renderPathFill = _renderPath.PathBoundingBox;
-            _renderPathStroke = _renderPath.CopyByStrokingPath(_strokeWidth, _strokeLineCap, _strokeLineJoin, _strokeMiterLimit).PathBoundingBox;
-
-            CATransaction.Commit();
-
-            SetNeedsDisplay();
-        }
-
-        void RenderShape(CGContext graphics)
-        {
-            if (_path == null)
-                return;
-
-            if (_stroke == null && _fill == null)
-                return;
-
-            CATransaction.Begin();
-            CATransaction.DisableActions = true;
-
-            graphics.SetLineWidth(_strokeWidth);
-            graphics.SetLineDash(_dashOffset * _strokeWidth, _strokeDash);
-            graphics.SetLineCap(_strokeLineCap);
-            graphics.SetLineJoin(_strokeLineJoin);
-            graphics.SetMiterLimit(_strokeMiterLimit * _strokeWidth / 4);
-
-            if (_fill is GradientBrush fillGradientBrush)
-            {
-                graphics.AddPath(_renderPath);
-
-                if (_fillMode)
-                    graphics.Clip();
-                else
-                    graphics.EOClip();
-
-                RenderBrush(graphics, _renderPathFill, fillGradientBrush);
-            }
-            else
-            {
-                CGColor fillColor =
+			_fillMode = false;
+			_stretch = Stretch.None;
+			_strokeLineCap = CGLineCap.Butt;
+			_strokeLineJoin = CGLineJoin.Miter;
+			_strokeMiterLimit = 10;
+		}
+
+		public override void DrawInContext(CGContext ctx)
+		{
+			base.DrawInContext(ctx);
+			RenderShape(ctx);
+		}
+
+		public void UpdateShape(CGPath path)
+		{
+			_path = path;
+
+			if (_path != null)
+				_pathFillBounds = _path.PathBoundingBox;
+			else
+				_pathFillBounds = new CGRect();
+
+			UpdatePathStrokeBounds();
+		}
+
+		public void UpdateFillMode(bool fillMode)
+		{
+			_fillMode = fillMode;
+			SetNeedsDisplay();
+		}
+
+		public SizeRequest GetDesiredSize()
+		{
+			return new SizeRequest(new Size(
+				Math.Max(0, nfloat.IsNaN(_pathStrokeBounds.Right) ? 0 : _pathStrokeBounds.Right),
+				Math.Max(0, nfloat.IsNaN(_pathStrokeBounds.Bottom) ? 0 : _pathStrokeBounds.Bottom)));
+		}
+
+		public void UpdateSize(CGSize size)
+		{
+			Bounds = new CGRect(new CGPoint(), size);
+			BuildRenderPath();
+		}
+
+		public void UpdateAspect(Stretch stretch)
+		{
+			_stretch = stretch;
+			BuildRenderPath();
+		}
+
+		public void UpdateFill(Brush fill)
+		{
+			_fill = fill;
+			SetNeedsDisplay();
+		}
+
+		public void UpdateStroke(Brush stroke)
+		{
+			_stroke = stroke;
+			SetNeedsDisplay();
+		}
+
+		public void UpdateStrokeThickness(double strokeWidth)
+		{
+			_strokeWidth = new nfloat(strokeWidth);
+			BuildRenderPath();
+		}
+
+		public void UpdateStrokeDash(nfloat[] dash)
+		{
+			_strokeDash = dash;
+			SetNeedsDisplay();
+		}
+
+		public void UpdateStrokeDashOffset(nfloat dashOffset)
+		{
+			_dashOffset = dashOffset;
+			SetNeedsDisplay();
+		}
+
+		public void UpdateStrokeLineCap(CGLineCap strokeLineCap)
+		{
+			_strokeLineCap = strokeLineCap;
+			UpdatePathStrokeBounds();
+			SetNeedsDisplay();
+		}
+
+		public void UpdateStrokeLineJoin(CGLineJoin strokeLineJoin)
+		{
+			_strokeLineJoin = strokeLineJoin;
+			UpdatePathStrokeBounds();
+			SetNeedsDisplay();
+		}
+
+		public void UpdateStrokeMiterLimit(nfloat strokeMiterLimit)
+		{
+			_strokeMiterLimit = strokeMiterLimit;
+			UpdatePathStrokeBounds();
+			SetNeedsDisplay();
+		}
+
+		void BuildRenderPath()
+		{
+			if (_path == null)
+			{
+				_renderPath = null;
+				_renderPathFill = new CGRect();
+				_renderPathStroke = new CGRect();
+				return;
+			}
+
+			CATransaction.Begin();
+			CATransaction.DisableActions = true;
+
+			if (_stretch != Stretch.None)
+			{
+				CGRect viewBounds = Bounds;
+				viewBounds.X += _strokeWidth / 2;
+				viewBounds.Y += _strokeWidth / 2;
+				viewBounds.Width -= _strokeWidth;
+				viewBounds.Height -= _strokeWidth;
+
+				nfloat widthScale = viewBounds.Width / _pathFillBounds.Width;
+				nfloat heightScale = viewBounds.Height / _pathFillBounds.Height;
+				var stretchTransform = CGAffineTransform.MakeIdentity();
+
+				switch (_stretch)
+				{
+					case Stretch.None:
+						break;
+
+					case Stretch.Fill:
+						stretchTransform.Scale(widthScale, heightScale);
+
+						stretchTransform.Translate(
+							viewBounds.Left - widthScale * _pathFillBounds.Left,
+							viewBounds.Top - heightScale * _pathFillBounds.Top);
+						break;
+
+					case Stretch.Uniform:
+						nfloat minScale = NMath.Min(widthScale, heightScale);
+
+						stretchTransform.Scale(minScale, minScale);
+
+						stretchTransform.Translate(
+							viewBounds.Left - minScale * _pathFillBounds.Left +
+							(viewBounds.Width - minScale * _pathFillBounds.Width) / 2,
+							viewBounds.Top - minScale * _pathFillBounds.Top +
+							(viewBounds.Height - minScale * _pathFillBounds.Height) / 2);
+						break;
+
+					case Stretch.UniformToFill:
+						nfloat maxScale = NMath.Max(widthScale, heightScale);
+
+						stretchTransform.Scale(maxScale, maxScale);
+
+						stretchTransform.Translate(
+							viewBounds.Left - maxScale * _pathFillBounds.Left,
+							viewBounds.Top - maxScale * _pathFillBounds.Top);
+						break;
+				}
+
+				Frame = Bounds;
+				_renderPath = _path.CopyByTransformingPath(stretchTransform);
+			}
+			else
+			{
+				nfloat adjustX = NMath.Min(0, _pathStrokeBounds.X);
+				nfloat adjustY = NMath.Min(0, _pathStrokeBounds.Y);
+
+				if (adjustX < 0 || adjustY < 0)
+				{
+					nfloat width = Bounds.Width;
+					nfloat height = Bounds.Height;
+
+					if (_pathStrokeBounds.Width > Bounds.Width)
+						width = Bounds.Width - adjustX;
+					if (_pathStrokeBounds.Height > Bounds.Height)
+						height = Bounds.Height - adjustY;
+
+					Frame = new CGRect(adjustX, adjustY, width, height);
+					var transform = new CGAffineTransform(Bounds.Width / width, 0, 0, Bounds.Height / height, -adjustX, -adjustY);
+					_renderPath = _path.CopyByTransformingPath(transform);
+				}
+				else
+				{
+					Frame = Bounds;
+					_renderPath = _path.CopyByTransformingPath(CGAffineTransform.MakeIdentity());
+				}
+			}
+
+			_renderPathFill = _renderPath.PathBoundingBox;
+			_renderPathStroke = _renderPath.CopyByStrokingPath(_strokeWidth, _strokeLineCap, _strokeLineJoin, _strokeMiterLimit).PathBoundingBox;
+
+			CATransaction.Commit();
+
+			SetNeedsDisplay();
+		}
+
+		void RenderShape(CGContext graphics)
+		{
+			if (_path == null)
+				return;
+
+			if (_stroke == null && _fill == null)
+				return;
+
+			CATransaction.Begin();
+			CATransaction.DisableActions = true;
+
+			graphics.SetLineWidth(_strokeWidth);
+			graphics.SetLineDash(_dashOffset * _strokeWidth, _strokeDash);
+			graphics.SetLineCap(_strokeLineCap);
+			graphics.SetLineJoin(_strokeLineJoin);
+			graphics.SetMiterLimit(_strokeMiterLimit * _strokeWidth / 4);
+
+			if (_fill is GradientBrush fillGradientBrush)
+			{
+				graphics.AddPath(_renderPath);
+
+				if (_fillMode)
+					graphics.Clip();
+				else
+					graphics.EOClip();
+
+				RenderBrush(graphics, _renderPathFill, fillGradientBrush);
+			}
+			else
+			{
+				CGColor fillColor =
 #if __MOBILE__
-                    UIColor.Clear.CGColor;
+					UIColor.Clear.CGColor;
 #else
                     NSColor.Clear.CGColor;
 #endif
-                if (_fill is SolidColorBrush solidColorBrush && solidColorBrush.Color != null)
-                    fillColor = solidColorBrush.Color.ToCGColor();
-
-                graphics.AddPath(_renderPath);
-                graphics.SetFillColor(fillColor);
-                graphics.DrawPath(_fillMode ? CGPathDrawingMode.FillStroke : CGPathDrawingMode.EOFillStroke);
-            }
-
-            if (_stroke is GradientBrush strokeGradientBrush)
-            {
-                graphics.AddPath(_renderPath);
-                graphics.ReplacePathWithStrokedPath();
-                graphics.Clip();
-                RenderBrush(graphics, _renderPathStroke, strokeGradientBrush);
-            }
-            else
-            {
-                CGColor strokeColor =
+				if (_fill is SolidColorBrush solidColorBrush && solidColorBrush.Color != null)
+					fillColor = solidColorBrush.Color.ToCGColor();
+
+				graphics.AddPath(_renderPath);
+				graphics.SetFillColor(fillColor);
+				graphics.DrawPath(_fillMode ? CGPathDrawingMode.FillStroke : CGPathDrawingMode.EOFillStroke);
+			}
+
+			if (_stroke is GradientBrush strokeGradientBrush)
+			{
+				graphics.AddPath(_renderPath);
+				graphics.ReplacePathWithStrokedPath();
+				graphics.Clip();
+				RenderBrush(graphics, _renderPathStroke, strokeGradientBrush);
+			}
+			else
+			{
+				CGColor strokeColor =
 #if __MOBILE__
-                    UIColor.Clear.CGColor;
+					UIColor.Clear.CGColor;
 #else
                     NSColor.Clear.CGColor;
 #endif
-                if (_stroke is SolidColorBrush solidColorBrush && solidColorBrush.Color != null)
-                    strokeColor = solidColorBrush.Color.ToCGColor();
-
-                graphics.AddPath(_renderPath);
-                graphics.SetStrokeColor(strokeColor);
-                graphics.DrawPath(CGPathDrawingMode.Stroke);
-            }
-
-            CATransaction.Commit();
-        }
-
-        void RenderBrush(CGContext graphics, CGRect pathBounds, GradientBrush brush)
-        {
-            if (brush == null)
-                return;
-
-            using (CGColorSpace rgb = CGColorSpace.CreateDeviceRGB())
-            {
-                CGColor[] colors = new CGColor[brush.GradientStops.Count];
-                nfloat[] locations = new nfloat[brush.GradientStops.Count];
-
-                for (int index = 0; index < brush.GradientStops.Count; index++)
-                {
-                    Color color = brush.GradientStops[index].Color;
-                    colors[index] = new CGColor(new nfloat(color.Red), new nfloat(color.Green), new nfloat(color.Blue), new nfloat(color.Alpha));
-                    locations[index] = new nfloat(brush.GradientStops[index].Offset);
-                }
-
-                CGGradient gradient = new CGGradient(rgb, colors, locations);
-
-                if (brush is LinearGradientBrush linearGradientBrush)
-                {
-                    graphics.DrawLinearGradient(
-                        gradient,
-                        new CGPoint(pathBounds.Left + linearGradientBrush.StartPoint.X * pathBounds.Width, pathBounds.Top + linearGradientBrush.StartPoint.Y * pathBounds.Height),
-                        new CGPoint(pathBounds.Left + linearGradientBrush.EndPoint.X * pathBounds.Width, pathBounds.Top + linearGradientBrush.EndPoint.Y * pathBounds.Height),
-                        CGGradientDrawingOptions.DrawsBeforeStartLocation | CGGradientDrawingOptions.DrawsAfterEndLocation);
-                }
-
-                if (brush is RadialGradientBrush radialGradientBrush)
-                {
-                    graphics.DrawRadialGradient(
-                        gradient,
-                        new CGPoint(radialGradientBrush.Center.X * pathBounds.Width + pathBounds.Left, radialGradientBrush.Center.Y * pathBounds.Height + pathBounds.Top),
-                        0.0f,
-                        new CGPoint(radialGradientBrush.Center.X * pathBounds.Width + pathBounds.Left, radialGradientBrush.Center.Y * pathBounds.Height + pathBounds.Top),
-                        (nfloat)(radialGradientBrush.Radius * Math.Max(pathBounds.Height, pathBounds.Width)),
-                        CGGradientDrawingOptions.DrawsBeforeStartLocation | CGGradientDrawingOptions.DrawsAfterEndLocation);
-                }
-            }
-        }
-
-        void UpdatePathStrokeBounds()
-        {
-            if (_path != null)
-                _pathStrokeBounds = _path.CopyByStrokingPath(_strokeWidth, _strokeLineCap, _strokeLineJoin, _strokeMiterLimit).PathBoundingBox;
-            else
-                _pathStrokeBounds = new CGRect();
-
-            BuildRenderPath();
-        }
-    }
+				if (_stroke is SolidColorBrush solidColorBrush && solidColorBrush.Color != null)
+					strokeColor = solidColorBrush.Color.ToCGColor();
+
+				graphics.AddPath(_renderPath);
+				graphics.SetStrokeColor(strokeColor);
+				graphics.DrawPath(CGPathDrawingMode.Stroke);
+			}
+
+			CATransaction.Commit();
+		}
+
+		void RenderBrush(CGContext graphics, CGRect pathBounds, GradientBrush brush)
+		{
+			if (brush == null)
+				return;
+
+			using (CGColorSpace rgb = CGColorSpace.CreateDeviceRGB())
+			{
+				CGColor[] colors = new CGColor[brush.GradientStops.Count];
+				nfloat[] locations = new nfloat[brush.GradientStops.Count];
+
+				for (int index = 0; index < brush.GradientStops.Count; index++)
+				{
+					Color color = brush.GradientStops[index].Color;
+					colors[index] = new CGColor(new nfloat(color.Red), new nfloat(color.Green), new nfloat(color.Blue), new nfloat(color.Alpha));
+					locations[index] = new nfloat(brush.GradientStops[index].Offset);
+				}
+
+				CGGradient gradient = new CGGradient(rgb, colors, locations);
+
+				if (brush is LinearGradientBrush linearGradientBrush)
+				{
+					graphics.DrawLinearGradient(
+						gradient,
+						new CGPoint(pathBounds.Left + linearGradientBrush.StartPoint.X * pathBounds.Width, pathBounds.Top + linearGradientBrush.StartPoint.Y * pathBounds.Height),
+						new CGPoint(pathBounds.Left + linearGradientBrush.EndPoint.X * pathBounds.Width, pathBounds.Top + linearGradientBrush.EndPoint.Y * pathBounds.Height),
+						CGGradientDrawingOptions.DrawsBeforeStartLocation | CGGradientDrawingOptions.DrawsAfterEndLocation);
+				}
+
+				if (brush is RadialGradientBrush radialGradientBrush)
+				{
+					graphics.DrawRadialGradient(
+						gradient,
+						new CGPoint(radialGradientBrush.Center.X * pathBounds.Width + pathBounds.Left, radialGradientBrush.Center.Y * pathBounds.Height + pathBounds.Top),
+						0.0f,
+						new CGPoint(radialGradientBrush.Center.X * pathBounds.Width + pathBounds.Left, radialGradientBrush.Center.Y * pathBounds.Height + pathBounds.Top),
+						(nfloat)(radialGradientBrush.Radius * Math.Max(pathBounds.Height, pathBounds.Width)),
+						CGGradientDrawingOptions.DrawsBeforeStartLocation | CGGradientDrawingOptions.DrawsAfterEndLocation);
+				}
+			}
+		}
+
+		void UpdatePathStrokeBounds()
+		{
+			if (_path != null)
+				_pathStrokeBounds = _path.CopyByStrokingPath(_strokeWidth, _strokeLineCap, _strokeLineJoin, _strokeMiterLimit).PathBoundingBox;
+			else
+				_pathStrokeBounds = new CGRect();
+
+			BuildRenderPath();
+		}
+	}
 }
\ No newline at end of file
diff --git a/src/Compatibility/Core/src/iOS/ViewRenderer.cs b/src/Compatibility/Core/src/iOS/ViewRenderer.cs
index d0b5536bd72b..d98b5fa96c67 100644
--- a/src/Compatibility/Core/src/iOS/ViewRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/ViewRenderer.cs
@@ -4,6 +4,7 @@
 using RectangleF = CoreGraphics.CGRect;
 using SizeF = CoreGraphics.CGSize;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Controls.Platform;
 
 #if __MOBILE__
 using UIKit;
@@ -137,7 +138,7 @@ protected override void OnElementChanged(ElementChangedEventArgs<TView> e)
 				if (Control != null && e.OldElement != null && e.OldElement.BackgroundColor != e.NewElement.BackgroundColor || e.NewElement.BackgroundColor != null)
 					SetBackgroundColor(e.NewElement.BackgroundColor);
 
-				if(Control != null && e.OldElement != null && e.OldElement.Background != e.NewElement.Background)
+				if (Control != null && e.OldElement != null && e.OldElement.Background != e.NewElement.Background)
 					SetBackground(e.NewElement.Background);
 
 				e.NewElement.FocusChangeRequested += ViewOnFocusChangeRequested;
@@ -301,7 +302,7 @@ void ViewOnFocusChangeRequested(object sender, VisualElement.FocusRequestArgs fo
 		{
 			if (Control == null)
 				return;
-				
+
 #if __MOBILE__
 			focusRequestArgs.Result = focusRequestArgs.Focus ? Control.BecomeFirstResponder() : Control.ResignFirstResponder();
 #else
diff --git a/src/Compatibility/Core/src/iOS/VisualElementPackager.cs b/src/Compatibility/Core/src/iOS/VisualElementPackager.cs
index 5970dfa96356..da169226ee55 100644
--- a/src/Compatibility/Core/src/iOS/VisualElementPackager.cs
+++ b/src/Compatibility/Core/src/iOS/VisualElementPackager.cs
@@ -49,7 +49,7 @@ public void Load()
 					OnChildAdded(child);
 			}
 		}
-		
+
 		internal void Disconnect()
 		{
 			Disconnect(_element);
diff --git a/src/Compatibility/Core/src/iOS/VisualElementRenderer.cs b/src/Compatibility/Core/src/iOS/VisualElementRenderer.cs
index ecd7563cadb4..4e94f5587c85 100644
--- a/src/Compatibility/Core/src/iOS/VisualElementRenderer.cs
+++ b/src/Compatibility/Core/src/iOS/VisualElementRenderer.cs
@@ -3,11 +3,11 @@
 using System.ComponentModel;
 using RectangleF = CoreGraphics.CGRect;
 using SizeF = CoreGraphics.CGSize;
-using Microsoft.Maui.Controls.Compatibility.Internals;
 using CoreAnimation;
 using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
 using Microsoft.Maui.Controls.Internals;
 using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Controls.Platform;
 
 #if __MOBILE__
 using UIKit;
diff --git a/src/Compatibility/Core/src/iOS/VisualElementTracker.cs b/src/Compatibility/Core/src/iOS/VisualElementTracker.cs
index 33b4733f05c8..39cb647e6882 100644
--- a/src/Compatibility/Core/src/iOS/VisualElementTracker.cs
+++ b/src/Compatibility/Core/src/iOS/VisualElementTracker.cs
@@ -266,7 +266,7 @@ void update()
 #endif
 
 					// must reset transform prior to setting frame...
-					if(caLayer.AnchorPoint != _originalAnchor)
+					if (caLayer.AnchorPoint != _originalAnchor)
 						caLayer.AnchorPoint = _originalAnchor;
 
 					caLayer.Transform = transform;
@@ -489,6 +489,6 @@ bool ShouldUpdateClip()
 				return true;
 
 			return false;
-		}	
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Compatibility/Core/tests/WinUI/BackgroundColorTests.cs b/src/Compatibility/Core/tests/WinUI/BackgroundColorTests.cs
index f100e59b7770..943fe4347683 100644
--- a/src/Compatibility/Core/tests/WinUI/BackgroundColorTests.cs
+++ b/src/Compatibility/Core/tests/WinUI/BackgroundColorTests.cs
@@ -1,13 +1,13 @@
 using System.Collections;
 using System.Linq;
 using System.Threading.Tasks;
-using NUnit.Framework;
+using Microsoft.Maui.Controls.Compatibility.Platform.UWP;
+using Microsoft.Maui.Graphics;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media;
-using Microsoft.Maui.Controls.Compatibility.Platform.UWP;
+using NUnit.Framework;
 using WColor = Windows.UI.Color;
 using WSolidColorBrush = Microsoft.UI.Xaml.Media.SolidColorBrush;
-using Microsoft.Maui.Graphics;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UAP.UnitTests
 {
diff --git a/src/Compatibility/Core/tests/WinUI/ColorTests.cs b/src/Compatibility/Core/tests/WinUI/ColorTests.cs
index 24fb1ea9260b..f5db20b19bf0 100644
--- a/src/Compatibility/Core/tests/WinUI/ColorTests.cs
+++ b/src/Compatibility/Core/tests/WinUI/ColorTests.cs
@@ -1,6 +1,6 @@
-using NUnit.Framework;
 using Microsoft.Maui.Controls.Compatibility.Platform.UWP;
 using Microsoft.Maui.Graphics;
+using NUnit.Framework;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UAP.UnitTests
 {
@@ -8,7 +8,7 @@ namespace Microsoft.Maui.Controls.Compatibility.Platform.UAP.UnitTests
 	public class ColorTests
 	{
 		[Test, Category("Color")]
-		public void PrimaryColorConversions() 
+		public void PrimaryColorConversions()
 		{
 			// 11:15, restate my assumptions...
 
diff --git a/src/Compatibility/Core/tests/WinUI/Compatibility.Windows.UnitTests.csproj b/src/Compatibility/Core/tests/WinUI/Compatibility.Windows.UnitTests.csproj
index 7e154921d89c..ebe7596c7dbe 100644
--- a/src/Compatibility/Core/tests/WinUI/Compatibility.Windows.UnitTests.csproj
+++ b/src/Compatibility/Core/tests/WinUI/Compatibility.Windows.UnitTests.csproj
@@ -4,7 +4,7 @@
     <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
     <RootNamespace>Microsoft.Maui.Controls.Compatibility.UAP.UnitTests</RootNamespace>
     <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
-    <DefineConstants>$(DefineConstants);DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;UWP_16299</DefineConstants>
+    <DefineConstants>$(DefineConstants);DEBUG;TRACE;NETFX_CORE;WINDOWS;UWP_16299</DefineConstants>
     <NoWarn>1701;1702;CS8305;8305;CA1416</NoWarn>
   </PropertyGroup>
   
@@ -62,7 +62,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -71,7 +71,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -79,7 +79,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS</DefineConstants>
     <NoWarn>;2008</NoWarn>
     <DebugType>full</DebugType>
     <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -88,7 +88,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <PlatformTarget>x86</PlatformTarget>
     <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS</DefineConstants>
     <Optimize>true</Optimize>
     <NoWarn>;2008</NoWarn>
     <DebugType>pdbonly</DebugType>
@@ -99,7 +99,7 @@
     <PlatformTarget>ARM</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\ARM\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS</DefineConstants>
     <NoWarn>;2008</NoWarn>
     <DebugType>full</DebugType>
     <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -108,7 +108,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
     <PlatformTarget>ARM</PlatformTarget>
     <OutputPath>bin\ARM\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS</DefineConstants>
     <Optimize>true</Optimize>
     <NoWarn>;2008</NoWarn>
     <DebugType>pdbonly</DebugType>
@@ -119,7 +119,7 @@
     <PlatformTarget>ARM64</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\ARM64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS</DefineConstants>
     <NoWarn>;2008</NoWarn>
     <DebugType>full</DebugType>
     <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -128,7 +128,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
     <PlatformTarget>ARM64</PlatformTarget>
     <OutputPath>bin\ARM64\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS</DefineConstants>
     <Optimize>true</Optimize>
     <NoWarn>;2008</NoWarn>
     <DebugType>pdbonly</DebugType>
@@ -139,7 +139,7 @@
     <PlatformTarget>x64</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS</DefineConstants>
     <NoWarn>;2008</NoWarn>
     <DebugType>full</DebugType>
     <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -148,7 +148,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <PlatformTarget>x64</PlatformTarget>
     <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS</DefineConstants>
     <Optimize>true</Optimize>
     <NoWarn>;2008</NoWarn>
     <DebugType>pdbonly</DebugType>
diff --git a/src/Compatibility/Core/tests/WinUI/EmbeddingTests.cs b/src/Compatibility/Core/tests/WinUI/EmbeddingTests.cs
index 5e645454ff87..e95645021ccf 100644
--- a/src/Compatibility/Core/tests/WinUI/EmbeddingTests.cs
+++ b/src/Compatibility/Core/tests/WinUI/EmbeddingTests.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
-using NUnit.Framework;
-using Microsoft.UI.Xaml;
 using Microsoft.Maui.Controls.Compatibility.Platform.UWP;
+using Microsoft.UI.Xaml;
+using NUnit.Framework;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UAP.UnitTests
 {
@@ -12,7 +12,8 @@ public class EmbeddingTests
 		public async Task CanCreateFrameworkElementFromContentPage()
 		{
 			var contentPage = new ContentPage { Title = "Embedded Page" };
-			await Device.InvokeOnMainThreadAsync(() => {
+			await Device.InvokeOnMainThreadAsync(() =>
+			{
 				FrameworkElement frameworkElement = contentPage.CreateFrameworkElement();
 			});
 		}
diff --git a/src/Compatibility/Core/tests/WinUI/FlowDirectionTests.cs b/src/Compatibility/Core/tests/WinUI/FlowDirectionTests.cs
index 57fad702effa..07d720751806 100644
--- a/src/Compatibility/Core/tests/WinUI/FlowDirectionTests.cs
+++ b/src/Compatibility/Core/tests/WinUI/FlowDirectionTests.cs
@@ -1,8 +1,8 @@
+using System;
 using System.Threading.Tasks;
 using NUnit.Framework;
-using WTextAlignment = Microsoft.UI.Xaml.TextAlignment;
 using WFlowDirection = Microsoft.UI.Xaml.FlowDirection;
-using System;
+using WTextAlignment = Microsoft.UI.Xaml.TextAlignment;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UAP.UnitTests
 {
@@ -26,7 +26,8 @@ public async Task<WTextAlignment> EntryAlignmentMatchesFlowDirection(bool isExpl
 				contentPage.FlowDirection = flowDirection;
 			}
 
-			var nativeAlignment = await Device.InvokeOnMainThreadAsync(() => {
+			var nativeAlignment = await Device.InvokeOnMainThreadAsync(() =>
+			{
 				if (!isExplicit)
 				{
 					GetRenderer(contentPage);
@@ -38,7 +39,7 @@ public async Task<WTextAlignment> EntryAlignmentMatchesFlowDirection(bool isExpl
 			return nativeAlignment;
 		}
 
-		async Task<Tuple<WTextAlignment, WFlowDirection>> GetEditorAlignmentAndFlowDirection(bool isExplicit, FlowDirection flowDirection) 
+		async Task<Tuple<WTextAlignment, WFlowDirection>> GetEditorAlignmentAndFlowDirection(bool isExplicit, FlowDirection flowDirection)
 		{
 			var editor = new Editor { Text = " تسجيل الدخول" };
 			var contentPage = new ContentPage { Title = "Flow Direction", Content = editor };
@@ -52,7 +53,8 @@ async Task<Tuple<WTextAlignment, WFlowDirection>> GetEditorAlignmentAndFlowDirec
 				contentPage.FlowDirection = flowDirection;
 			}
 
-			var (nativeAlignment, nativeFlowDirection) = await Device.InvokeOnMainThreadAsync(() => {
+			var (nativeAlignment, nativeFlowDirection) = await Device.InvokeOnMainThreadAsync(() =>
+			{
 				if (!isExplicit)
 				{
 					GetRenderer(contentPage);
diff --git a/src/Compatibility/Core/tests/WinUI/IsEnabledTests.cs b/src/Compatibility/Core/tests/WinUI/IsEnabledTests.cs
index 9b34017d8254..06d899c9bb0c 100644
--- a/src/Compatibility/Core/tests/WinUI/IsEnabledTests.cs
+++ b/src/Compatibility/Core/tests/WinUI/IsEnabledTests.cs
@@ -5,7 +5,7 @@
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UAP.UnitTests
 {
 	[TestFixture]
-	public class IsEnabledTests : PlatformTestFixture 
+	public class IsEnabledTests : PlatformTestFixture
 	{
 		static IEnumerable TestCases
 		{
diff --git a/src/Compatibility/Core/tests/WinUI/PlatformTestFixture.cs b/src/Compatibility/Core/tests/WinUI/PlatformTestFixture.cs
index 2bc24ee6708f..07b5f0e175eb 100644
--- a/src/Compatibility/Core/tests/WinUI/PlatformTestFixture.cs
+++ b/src/Compatibility/Core/tests/WinUI/PlatformTestFixture.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using NUnit.Framework;
-using Microsoft.UI.Xaml.Controls;
 using Microsoft.Maui.Controls.Compatibility.Platform.UWP;
+using Microsoft.UI.Xaml.Controls;
+using NUnit.Framework;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UAP.UnitTests
 {
@@ -53,18 +53,18 @@ protected Control GetNativeControl(VisualElement element)
 			return GetRenderer(element).GetNativeElement() as Control;
 		}
 
-		protected Panel GetPanel(VisualElement element) 
+		protected Panel GetPanel(VisualElement element)
 		{
 			return GetRenderer(element).ContainerElement as Panel;
 		}
 
-		protected Border GetBorder(VisualElement element) 
+		protected Border GetBorder(VisualElement element)
 		{
 			var renderer = GetRenderer(element);
 			var nativeElement = renderer.GetNativeElement();
 			return nativeElement as Border;
 		}
-		
+
 		protected TextBlock GetNativeControl(Label label)
 		{
 			return GetRenderer(label).GetNativeElement() as TextBlock;
@@ -72,7 +72,8 @@ protected TextBlock GetNativeControl(Label label)
 
 		protected async Task<TProperty> GetControlProperty<TProperty>(Label label, Func<TextBlock, TProperty> getProperty)
 		{
-			return await Device.InvokeOnMainThreadAsync(() => {
+			return await Device.InvokeOnMainThreadAsync(() =>
+			{
 				var textBlock = GetNativeControl(label);
 				return getProperty(textBlock);
 			});
@@ -96,7 +97,8 @@ protected FormsTextBox GetNativeControl(Editor editor)
 		protected async Task<TProperty> GetRendererProperty<TProperty>(View view,
 			Func<IVisualElementRenderer, TProperty> getProperty)
 		{
-			return await Device.InvokeOnMainThreadAsync(() => {
+			return await Device.InvokeOnMainThreadAsync(() =>
+			{
 				var renderer = GetRenderer(view);
 				return getProperty(renderer);
 			});
diff --git a/src/Compatibility/Core/tests/WinUI/RotationTests.cs b/src/Compatibility/Core/tests/WinUI/RotationTests.cs
index 099fd6929db0..f16b209f3c55 100644
--- a/src/Compatibility/Core/tests/WinUI/RotationTests.cs
+++ b/src/Compatibility/Core/tests/WinUI/RotationTests.cs
@@ -1,14 +1,14 @@
 using System;
 using System.Collections;
 using System.Threading.Tasks;
-using NUnit.Framework;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
+using NUnit.Framework;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UAP.UnitTests
 {
 	[TestFixture]
-	public class RotationTests : PlatformTestFixture 
+	public class RotationTests : PlatformTestFixture
 	{
 		static IEnumerable RotationXCases
 		{
@@ -73,7 +73,7 @@ public async Task RotationConsistent(View view)
 			Assert.That(actual, Is.EqualTo(expected));
 		}
 
-		double GetRotationX(FrameworkElement fe) 
+		double GetRotationX(FrameworkElement fe)
 		{
 			if (fe.Projection is PlaneProjection planeProjection)
 			{
diff --git a/src/Compatibility/Core/tests/WinUI/ScaleTests.cs b/src/Compatibility/Core/tests/WinUI/ScaleTests.cs
index 4b91cd801574..c4b6c8344839 100644
--- a/src/Compatibility/Core/tests/WinUI/ScaleTests.cs
+++ b/src/Compatibility/Core/tests/WinUI/ScaleTests.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Collections;
 using System.Threading.Tasks;
-using NUnit.Framework;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
+using NUnit.Framework;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UAP.UnitTests
 {
diff --git a/src/Compatibility/Core/tests/WinUI/ScrollBarVisibilityTests.cs b/src/Compatibility/Core/tests/WinUI/ScrollBarVisibilityTests.cs
index d320b5ff0821..a479e15e7ff2 100644
--- a/src/Compatibility/Core/tests/WinUI/ScrollBarVisibilityTests.cs
+++ b/src/Compatibility/Core/tests/WinUI/ScrollBarVisibilityTests.cs
@@ -1,5 +1,5 @@
-using NUnit.Framework;
 using Microsoft.Maui.Controls.Compatibility.Platform.UWP;
+using NUnit.Framework;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UAP.UnitTests
 {
diff --git a/src/Compatibility/Core/tests/WinUI/ShellTests.cs b/src/Compatibility/Core/tests/WinUI/ShellTests.cs
index e0104c1113f4..c8f94981c238 100644
--- a/src/Compatibility/Core/tests/WinUI/ShellTests.cs
+++ b/src/Compatibility/Core/tests/WinUI/ShellTests.cs
@@ -3,10 +3,10 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using NUnit.Framework;
 using Microsoft.Maui.Controls.Compatibility;
 using Microsoft.Maui.Controls.Compatibility.Platform.UAP.UnitTests;
 using Microsoft.Maui.Controls.Compatibility.Platform.UWP;
+using NUnit.Framework;
 
 [assembly: ExportRenderer(typeof(TestShell), typeof(TestShellRenderer))]
 namespace Microsoft.Maui.Controls.Compatibility.Platform.UAP.UnitTests
@@ -33,7 +33,7 @@ await Device.InvokeOnMainThreadAsync(() =>
 					var r = GetRenderer(shell);
 				});
 			}
-			catch (Exception exc)			
+			catch (Exception exc)
 			{
 				Assert.Fail(exc.ToString());
 			}
@@ -68,8 +68,8 @@ Shell CreateShell()
 		}
 	}
 
-	public class TestShell : Shell { }	
-	
+	public class TestShell : Shell { }
+
 	public class TestShellRenderer : ShellRenderer
 	{
 	}
diff --git a/src/Compatibility/Maps/src/UWP/Compatibility.Maps.UWP.csproj b/src/Compatibility/Maps/src/UWP/Compatibility.Maps.UWP.csproj
index e2437ce16ec6..d0200a24760e 100644
--- a/src/Compatibility/Maps/src/UWP/Compatibility.Maps.UWP.csproj
+++ b/src/Compatibility/Maps/src/UWP/Compatibility.Maps.UWP.csproj
@@ -8,12 +8,12 @@
     <GenerateLibraryLayout>false</GenerateLibraryLayout>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS</DefineConstants>
   </PropertyGroup>
   <ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
     <EmbeddedResource Include="Properties\Xamarin.Forms.Maps.UWP.rd.xml" />
diff --git a/src/Controls/DualScreen/sample/DualScreen.UWP/DualScreen.UWP.csproj b/src/Controls/DualScreen/sample/DualScreen.UWP/DualScreen.UWP.csproj
index bc44d1067c54..9f1516b5fdd6 100644
--- a/src/Controls/DualScreen/sample/DualScreen.UWP/DualScreen.UWP.csproj
+++ b/src/Controls/DualScreen/sample/DualScreen.UWP/DualScreen.UWP.csproj
@@ -22,7 +22,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\ARM\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS</DefineConstants>
     <NoWarn>;2008</NoWarn>
     <DebugType>full</DebugType>
     <PlatformTarget>ARM</PlatformTarget>
@@ -32,7 +32,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
     <OutputPath>bin\ARM\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS</DefineConstants>
     <Optimize>true</Optimize>
     <NoWarn>;2008</NoWarn>
     <DebugType>pdbonly</DebugType>
@@ -45,7 +45,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS</DefineConstants>
     <NoWarn>;2008</NoWarn>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
@@ -55,7 +55,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS</DefineConstants>
     <Optimize>true</Optimize>
     <NoWarn>;2008</NoWarn>
     <DebugType>pdbonly</DebugType>
@@ -68,7 +68,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS</DefineConstants>
     <NoWarn>;2008</NoWarn>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
@@ -78,7 +78,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS</DefineConstants>
     <Optimize>true</Optimize>
     <NoWarn>;2008</NoWarn>
     <DebugType>pdbonly</DebugType>
diff --git a/src/Controls/samples/Controls.Sample.SingleProject/MainWindow.cs b/src/Controls/samples/Controls.Sample.SingleProject/MainWindow.cs
index 8aad3f92d9f3..a8a88a8d8b74 100644
--- a/src/Controls/samples/Controls.Sample.SingleProject/MainWindow.cs
+++ b/src/Controls/samples/Controls.Sample.SingleProject/MainWindow.cs
@@ -1,17 +1,13 @@
 using Microsoft.Maui;
+using Microsoft.Maui.Controls;
 
 namespace Maui.Controls.Sample.SingleProject
 {
-	public class MainWindow : IWindow
+	public class MainWindow : Window
 	{
-		public MainWindow()
+		static bool useBlazor = false;
+		public MainWindow() : base(useBlazor ? new BlazorPage() : new MainPage())
 		{
-			var useBlazor = false;
-			Page = useBlazor ? new BlazorPage() : new MainPage();
 		}
-
-		public IPage Page { get; set; }
-
-		public IMauiContext MauiContext { get; set; }
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample.SingleProject/Maui.Controls.Sample.SingleProject.csproj b/src/Controls/samples/Controls.Sample.SingleProject/Maui.Controls.Sample.SingleProject.csproj
index 5e22a7797428..c49e5806972d 100644
--- a/src/Controls/samples/Controls.Sample.SingleProject/Maui.Controls.Sample.SingleProject.csproj
+++ b/src/Controls/samples/Controls.Sample.SingleProject/Maui.Controls.Sample.SingleProject.csproj
@@ -40,7 +40,7 @@
   </ItemGroup>
   <ItemGroup>
     <MauiImage Include="Resources\AppIcons\appicon.svg" ForegroundFile="Resources\AppIcons\appicon_foreground.svg" IsAppIcon="true" />
-    <MauiAsset Include="Resources\Raw\*" />
+    <MauiAsset Include="Resources\Raw\*" Link="%(Filename)%(Extension)" />
     <MauiSplashScreen Include="Resources\AppIcons\appicon_foreground.svg" Color="#FF69B4" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample.SingleProject/MyApp.cs b/src/Controls/samples/Controls.Sample.SingleProject/MyApp.cs
index 8cba5f934cc0..b4cdfd67edf2 100644
--- a/src/Controls/samples/Controls.Sample.SingleProject/MyApp.cs
+++ b/src/Controls/samples/Controls.Sample.SingleProject/MyApp.cs
@@ -1,14 +1,20 @@
 using Microsoft.Maui;
+using System.Collections.Generic;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Maui.Controls.Sample.SingleProject
 {
 	public class MyApp : IApplication
 	{
+		List<IWindow> _windows = new List<IWindow>();
+		public IReadOnlyList<IWindow> Windows => _windows.AsReadOnly();
+
 		public IWindow CreateWindow(IActivationState activationState)
 		{
 			Microsoft.Maui.Controls.Compatibility.Forms.Init(activationState);
-
-			return new MainWindow();
+			var window = new MainWindow();
+			_windows.Add(window);			
+			return window;
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample.WinUI (Package)/Maui.Controls.Sample.WinUI (Package).wapproj b/src/Controls/samples/Controls.Sample.WinUI (Package)/Maui.Controls.Sample.WinUI (Package).wapproj
index a389a392ae6a..edb3050cd2ed 100644
--- a/src/Controls/samples/Controls.Sample.WinUI (Package)/Maui.Controls.Sample.WinUI (Package).wapproj	
+++ b/src/Controls/samples/Controls.Sample.WinUI (Package)/Maui.Controls.Sample.WinUI (Package).wapproj	
@@ -3,9 +3,6 @@
   <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0'">
     <VisualStudioVersion>15.0</VisualStudioVersion>
   </PropertyGroup>
-  <PropertyGroup>
-    <SkipImportNetSdk>true</SkipImportNetSdk>
-  </PropertyGroup>
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x86">
       <Configuration>Debug</Configuration>
@@ -41,6 +38,7 @@
     <ProjectGuid>503b7824-7376-450b-9ef7-ea587df2c8be</ProjectGuid>
     <TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <AssetTargetFallback>net6.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback>
     <DefaultLanguage>en-US</DefaultLanguage>
     <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
     <AppxTargetsLocation Condition="'$(AppxTargetsLocation)'==''">$(MSBuildThisFileDirectory)build\</AppxTargetsLocation>
diff --git a/src/Controls/samples/Controls.Sample.iOS/Controls.Sample.iOS.csproj b/src/Controls/samples/Controls.Sample.iOS/Controls.Sample.iOS.csproj
index 3369fef720b3..9d2c1bb42bd8 100644
--- a/src/Controls/samples/Controls.Sample.iOS/Controls.Sample.iOS.csproj
+++ b/src/Controls/samples/Controls.Sample.iOS/Controls.Sample.iOS.csproj
@@ -70,9 +70,6 @@
     <Reference Include="System.Numerics" />
     <Reference Include="System.Numerics.Vectors" />
   </ItemGroup>
-  <ItemGroup>
-    <InterfaceDefinition Include="LaunchScreen.storyboard" />
-  </ItemGroup>
   <ItemGroup>
     <None Include="Info.plist" />
     <None Include="Entitlements.plist" />
diff --git a/src/Controls/samples/Controls.Sample/Controls.Sample.csproj b/src/Controls/samples/Controls.Sample/Controls.Sample.csproj
index ed0ef7d6176f..9b4096475953 100644
--- a/src/Controls/samples/Controls.Sample/Controls.Sample.csproj
+++ b/src/Controls/samples/Controls.Sample/Controls.Sample.csproj
@@ -1,13 +1,15 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
-    <TargetFrameworks>MonoAndroid10.0;Xamarin.iOS10</TargetFrameworks>
+    <TargetFrameworks>$(NonNet6Platforms)</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
     <PackageReference Include="Microsoft.Extensions.Logging" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" />
   </ItemGroup>
 
   <ItemGroup>
@@ -25,16 +27,14 @@
   </ItemGroup>
 
   <ItemGroup>
+    <EmbeddedResource Include="Resources\Embedded\*" />
+    <MauiAsset Include="Resources\Raw\*" Link="%(Filename)%(Extension)" />
     <MauiImage Include="Resources\Images\*" />
+    <MauiImage Update="Resources\Images\*.gif" Resize="false" />
     <MauiImage Include="Resources\AppIcons\appicon.svg" ForegroundFile="Resources\AppIcons\appicon_foreground.svg" IsAppIcon="true" />
     <MauiFont Include="Resources\Fonts\*" />
     <MauiSplashScreen Include="Resources\Images\dotnet_bot.svg" Color="#FFFFFF" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="Pages\SemanticsPage.xaml.cs">
-      <DependentUpon>SemanticsPage.xaml</DependentUpon>
-    </Compile>
+    <AndroidResource Remove="Resources\**" />
   </ItemGroup>
 
   <Import Project="..\..\..\..\.nuspec\Microsoft.Maui.Controls.MultiTargeting.targets" />
diff --git a/src/Controls/samples/Controls.Sample/Controls/BasePage.cs b/src/Controls/samples/Controls.Sample/Controls/BasePage.cs
index 61fedff57dd8..b542df270d29 100644
--- a/src/Controls/samples/Controls.Sample/Controls/BasePage.cs
+++ b/src/Controls/samples/Controls.Sample/Controls/BasePage.cs
@@ -6,5 +6,14 @@ namespace Maui.Controls.Sample.Controls
 	public class BasePage : ContentPage, IPage
 	{
 
+		protected override void OnAppearing()
+		{
+			System.Diagnostics.Debug.WriteLine($"OnAppearing: {this}");
+		}
+
+		protected override void OnDisappearing()
+		{
+			System.Diagnostics.Debug.WriteLine($"OnDisappearing: {this}");
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample/Controls/RedButton/RedButton.cs b/src/Controls/samples/Controls.Sample/Controls/RedButton/RedButton.cs
new file mode 100644
index 000000000000..890476929219
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample/Controls/RedButton/RedButton.cs
@@ -0,0 +1,12 @@
+using Microsoft.Maui.Controls;
+
+namespace Maui.Controls.Sample.Controls
+{
+	public class RedButton : Button
+	{
+		static RedButton()
+		{
+			RedServiceBuilder.TryAddHandler<RedButton, RedButtonHandler>();
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample/Controls/RedButton/RedButtonAppHostBuilderExtensions.cs b/src/Controls/samples/Controls.Sample/Controls/RedButton/RedButtonAppHostBuilderExtensions.cs
new file mode 100644
index 000000000000..e7fadcff1a78
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample/Controls/RedButton/RedButtonAppHostBuilderExtensions.cs
@@ -0,0 +1,15 @@
+using System;
+using Microsoft.Maui.Hosting;
+
+namespace Maui.Controls.Sample.Controls
+{
+	static class RedButtonAppHostBuilderExtensions
+	{
+		public static IAppHostBuilder UseRed(this IAppHostBuilder builder, Action<RedServiceBuilder> configureDelegate = null)
+		{
+			builder.ConfigureServices<RedServiceBuilder>((ctx, red) => configureDelegate?.Invoke(red));
+
+			return builder;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample/Controls/RedButton/RedButtonHandler.cs b/src/Controls/samples/Controls.Sample/Controls/RedButton/RedButtonHandler.cs
new file mode 100644
index 000000000000..0129c76e4edd
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample/Controls/RedButton/RedButtonHandler.cs
@@ -0,0 +1,41 @@
+using Microsoft.Maui;
+using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Handlers;
+
+namespace Maui.Controls.Sample.Controls
+{
+	public partial class RedButtonHandler : ButtonHandler
+	{
+		public static PropertyMapper<RedButton, RedButtonHandler> RedButtonMapper = new PropertyMapper<RedButton, RedButtonHandler>(ButtonHandler.ButtonMapper)
+		{
+			[nameof(IButton.Background)] = MapBackground,
+		};
+
+		public RedButtonHandler()
+			: base(RedButtonMapper)
+		{
+		}
+
+		public RedButtonHandler(PropertyMapper mapper = null)
+			: base(mapper ?? RedButtonMapper)
+		{
+		}
+
+#if __ANDROID__
+		public static void MapBackground(RedButtonHandler handler, RedButton redButton)
+		{
+			handler.NativeView.SetBackgroundColor(Colors.Red.ToNative());
+		}
+#elif __IOS__
+		public static void MapBackground(RedButtonHandler handler, RedButton redButton)
+		{
+			handler.NativeView.BackgroundColor = Colors.Red.ToNative();
+		}
+#elif WINDOWS
+		public static void MapBackground(RedButtonHandler handler, RedButton redButton)
+		{
+			handler.NativeView.Background = Colors.Red.ToNative();
+		}
+#endif
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample/Controls/RedButton/RedServiceBuilder.cs b/src/Controls/samples/Controls.Sample/Controls/RedButton/RedServiceBuilder.cs
new file mode 100644
index 000000000000..ef0411008dec
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample/Controls/RedButton/RedServiceBuilder.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Maui;
+using Microsoft.Maui.Hosting;
+
+namespace Maui.Controls.Sample.Controls
+{
+	class RedServiceBuilder : IMauiServiceBuilder
+	{
+		static IMauiHandlersCollection handlersCollection;
+		static Dictionary<Type, Type> pendingHandlers = new();
+
+		public static void TryAddHandler<TType, TTypeRender>()
+			where TType : IFrameworkElement
+			where TTypeRender : IViewHandler
+		{
+			if (handlersCollection == null)
+				pendingHandlers[typeof(TType)] = typeof(TTypeRender);
+			else
+				handlersCollection.TryAddHandler<TType, TTypeRender>();
+		}
+
+		void IMauiServiceBuilder.ConfigureServices(HostBuilderContext context, IServiceCollection services)
+		{
+			// no-op
+		}
+
+		void IMauiServiceBuilder.Configure(HostBuilderContext context, IServiceProvider services)
+		{
+			handlersCollection ??= services.GetRequiredService<IMauiHandlersServiceProvider>().GetCollection();
+
+			if (pendingHandlers.Count > 0)
+			{
+				handlersCollection.TryAddHandlers(pendingHandlers);
+				pendingHandlers.Clear();
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample/Controls/Window.cs b/src/Controls/samples/Controls.Sample/Controls/Window.cs
deleted file mode 100644
index a85ea55c7ae9..000000000000
--- a/src/Controls/samples/Controls.Sample/Controls/Window.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Microsoft.Maui;
-
-namespace Maui.Controls.Sample.Controls
-{
-	public class Window : IWindow
-	{
-		public IPage Page { get; set; }
-
-		public IMauiContext MauiContext { get; set; }
-	}
-}
diff --git a/src/Controls/samples/Controls.Sample/Extensions/EssentialsExtensions.cs b/src/Controls/samples/Controls.Sample/Extensions/EssentialsExtensions.cs
index 96271d41f22a..0a3fd4ad913c 100644
--- a/src/Controls/samples/Controls.Sample/Extensions/EssentialsExtensions.cs
+++ b/src/Controls/samples/Controls.Sample/Extensions/EssentialsExtensions.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
 using Microsoft.Maui.Hosting;
 using Microsoft.Maui.LifecycleEvents;
 
@@ -119,14 +120,23 @@ public void ConfigureServices(HostBuilderContext context, IServiceCollection ser
 			public async void Configure(HostBuilderContext context, IServiceProvider services)
 			{
 #if WINDOWS
-				// Platform.MapServiceToken = _mapServiceToken;
+				Platform.MapServiceToken = _mapServiceToken;
 #elif __ANDROID__
 				SecureStorage.LegacyKeyHashFallback = _useLegaceSecureStorage;
 #endif
 
 				AppActions.OnAppAction += HandleOnAppAction;
 
-				await AppActions.SetAsync(_appActions);
+				try
+				{
+					await AppActions.SetAsync(_appActions);
+				}
+				catch (FeatureNotSupportedException ex)
+				{
+					services.GetService<ILoggerFactory>()?
+						.CreateLogger<IEssentialsBuilder>()?
+						.LogError(ex, "App Actions are not supported on this platform.");
+				}
 
 				if (_trackVersions)
 					VersionTracking.Track();
diff --git a/src/Controls/samples/Controls.Sample/MainWindow.cs b/src/Controls/samples/Controls.Sample/MainWindow.cs
deleted file mode 100644
index 5059d7ab1539..000000000000
--- a/src/Controls/samples/Controls.Sample/MainWindow.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Maui.Controls.Sample.Controls;
-using Microsoft.Maui;
-
-namespace Maui.Controls.Sample
-{
-	public class MainWindow : Window
-	{
-		public MainWindow(IPage page)
-		{
-			Page = page;
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample/Maui.Controls.Sample-net6.csproj b/src/Controls/samples/Controls.Sample/Maui.Controls.Sample-net6.csproj
index 98d6be1d4af4..a64342e54dd9 100644
--- a/src/Controls/samples/Controls.Sample/Maui.Controls.Sample-net6.csproj
+++ b/src/Controls/samples/Controls.Sample/Maui.Controls.Sample-net6.csproj
@@ -11,12 +11,14 @@
 
   <PropertyGroup Condition="$(TargetFramework.Contains('-windows')) == true ">
     <NoWarn>$(NoWarn);CA1416;CS8305</NoWarn>
-    <DefineConstants>$(DefineConstants);WINDOWS_UWP;WINDOWS</DefineConstants>
+    <DefineConstants>$(DefineConstants);WINDOWS</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration" />
     <PackageReference Include="Microsoft.Extensions.Logging" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
     <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.0-preview.3.21175.8" />
   </ItemGroup>
@@ -37,10 +39,14 @@
   </ItemGroup>
 
   <ItemGroup>
+    <EmbeddedResource Include="Resources\Embedded\*" />
+    <MauiAsset Include="Resources\Raw\*" />
     <MauiImage Include="Resources\Images\*" />
+    <MauiImage Update="Resources\Images\*.gif" Resize="false" />
     <MauiImage Include="Resources\AppIcons\appicon.svg" ForegroundFile="Resources\AppIcons\appicon_foreground.svg" IsAppIcon="true" />
     <MauiFont Include="Resources\Fonts\*" />
     <MauiSplashScreen Include="Resources\Images\dotnet_bot.svg" Color="#FFFFFF" />
+    <AndroidResource Remove="Resources\**" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Controls/samples/Controls.Sample/MyApp.cs b/src/Controls/samples/Controls.Sample/MyApp.cs
index a8f23aa0dce3..c212248c739f 100644
--- a/src/Controls/samples/Controls.Sample/MyApp.cs
+++ b/src/Controls/samples/Controls.Sample/MyApp.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using Maui.Controls.Sample.Services;
 using Microsoft.Extensions.DependencyInjection;
@@ -8,20 +9,25 @@ namespace Maui.Controls.Sample
 {
 	public class MyApp : IApplication
 	{
-		public MyApp(IServiceProvider services, ITextService textService)
+		readonly List<IWindow> _windows = new();
+
+		public MyApp(IServiceProvider services, ITextService textService, IImageSourceServiceConfiguration imageConfig)
 		{
 			Services = services;
-
 			Debug.WriteLine($"The injected text service had a message: '{textService.GetText()}'");
+			imageConfig.SetImageDirectory("Assets");
 		}
 
+		public IReadOnlyList<IWindow> Windows => _windows.AsReadOnly();
+
 		public IServiceProvider Services { get; }
 
 		public IWindow CreateWindow(IActivationState activationState)
 		{
 			Microsoft.Maui.Controls.Compatibility.Forms.Init(activationState);
-
-			return Services.GetRequiredService<IWindow>();
+			var window = Services.GetRequiredService<IWindow>();
+			_windows.Add(window);
+			return window;
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample/Pages/MainPage.cs b/src/Controls/samples/Controls.Sample/Pages/MainPage.cs
index bbbb6a15aeac..e636a324877f 100644
--- a/src/Controls/samples/Controls.Sample/Pages/MainPage.cs
+++ b/src/Controls/samples/Controls.Sample/Pages/MainPage.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using Maui.Controls.Sample.Controls;
 using Maui.Controls.Sample.ViewModel;
@@ -10,6 +11,7 @@
 using Microsoft.Maui.Graphics;
 using Microsoft.Maui.LifecycleEvents;
 using Debug = System.Diagnostics.Debug;
+using GradientStop = Microsoft.Maui.Controls.GradientStop;
 
 namespace Maui.Controls.Sample.Pages
 {
@@ -20,28 +22,60 @@ public class MainPage : BasePage
 
 		public MainPage(IServiceProvider services, MainPageViewModel viewModel)
 		{
+			BackgroundColor = Colors.White;
+			ToolbarItems.Add(new ToolbarItem()
+			{
+				Text = "Page"
+			});
+
+			Title = "Welcome to the Samples";
 			_services = services;
 			BindingContext = _viewModel = viewModel;
 
 			SetupMauiLayout();
+
+			NavigationPage.SetHasNavigationBar(this, false);
+
 			//SetupCompatibilityLayout();
+			//SetupVisibilityTest();
 		}
 
-		const string loremIpsum =
-				"Lorem ipsum dolor sit amet, consectetur adipiscing elit. " +
-				"Quisque ut dolor metus. Duis vel iaculis mauris, sit amet finibus mi. " +
-				"Etiam congue ornare risus, in facilisis libero tempor eget. " +
-				"Phasellus mattis mollis libero ut semper. In sit amet sapien odio. " +
-				"Sed interdum ullamcorper dui eu rutrum. Vestibulum non sagittis justo. " +
-				"Cras rutrum scelerisque elit, et porta est lobortis ac. " +
-				"Pellentesque eu ornare tortor. Sed bibendum a nisl at laoreet.";
+		public class VisibilityLabel : Label, IFrameworkElement
+		{
+			private Visibility _visibility;
+
+			public void SetVisibility(Visibility visibility) 
+			{
+				_visibility = visibility;
+				Handler?.UpdateValue(nameof(Visibility));
+			}
+
+			Visibility IFrameworkElement.Visibility
+			{
+				get 
+				{
+					return _visibility; 
+				}
+			}
+		}
+
+		const string LoremIpsum =
+			"Lorem ipsum dolor sit amet, consectetur adipiscing elit. " +
+			"Quisque ut dolor metus. Duis vel iaculis mauris, sit amet finibus mi. " +
+			"Etiam congue ornare risus, in facilisis libero tempor eget. " +
+			"Phasellus mattis mollis libero ut semper. In sit amet sapien odio. " +
+			"Sed interdum ullamcorper dui eu rutrum. Vestibulum non sagittis justo. " +
+			"Cras rutrum scelerisque elit, et porta est lobortis ac. " +
+			"Pellentesque eu ornare tortor. Sed bibendum a nisl at laoreet.";
 
 		void SetupMauiLayout()
 		{
 			var verticalStack = new VerticalStackLayout() { Spacing = 5, BackgroundColor = Colors.AntiqueWhite };
 			var horizontalStack = new HorizontalStackLayout() { Spacing = 2, BackgroundColor = Colors.CornflowerBlue };
 
-			verticalStack.Add(CreateSampleGrid());
+			//verticalStack.Add(CreateSampleGrid());
+			verticalStack.Add(CreateResizingButton());
+
 			AddTextResizeDemo(verticalStack);
 
 			verticalStack.Add(new Label { Text = " ", Padding = new Thickness(10) });
@@ -58,24 +92,51 @@ void SetupMauiLayout()
 			verticalStack.Add(new Label { Text = "This should be BOLD text!", FontAttributes = FontAttributes.Bold, HorizontalOptions = LayoutOptions.Center });
 			verticalStack.Add(new Label { Text = "This should have character spacing!", CharacterSpacing = 3 });
 			verticalStack.Add(new Label { Text = "This should be a CUSTOM font!", FontFamily = "Dokdo" });
+			verticalStack.Add(
+				new Button
+				{
+					Text = "Push a Page",
+					Command = new Command(async () =>
+					{
+						await Navigation.PushAsync(new SemanticsPage());
+					})
+				}
+			);
 
-
-#if __ANDROID__
-			string fontFamily = "ionicons.ttf#";
-#elif WINDOWS
-			string fontFamily = "Assets/ionicons.ttf#ionicons";
-#else
-			string fontFamily = "Ionicons";
-#endif
-
-			verticalStack.Add(new Image { Source = new FontImageSource() { FontFamily = fontFamily, Glyph = '\uf2fe'.ToString() } });
 			verticalStack.Add(new Label { Text = "This should have padding", Padding = new Thickness(40), BackgroundColor = Colors.LightBlue });
-			verticalStack.Add(new Label { Text = loremIpsum });
-			verticalStack.Add(new Label { Text = loremIpsum, MaxLines = 2 });
-			verticalStack.Add(new Label { Text = loremIpsum, LineBreakMode = LineBreakMode.TailTruncation });
-			verticalStack.Add(new Label { Text = loremIpsum, MaxLines = 2, LineBreakMode = LineBreakMode.TailTruncation });
-			verticalStack.Add(new Label { Text = "This should have five times the line height! " + loremIpsum, LineHeight = 5, MaxLines = 2 });
-			verticalStack.Add(new Editor { Text = "Start", HorizontalTextAlignment = TextAlignment.Start });
+			verticalStack.Add(new Label { Text = LoremIpsum });
+			verticalStack.Add(new Label { Text = LoremIpsum, MaxLines = 2 });
+			verticalStack.Add(new Label { Text = LoremIpsum, LineBreakMode = LineBreakMode.TailTruncation });
+			verticalStack.Add(new Label { Text = LoremIpsum, MaxLines = 2, LineBreakMode = LineBreakMode.TailTruncation });
+			verticalStack.Add(new Label { Text = "This should have five times the line height! " + LoremIpsum, LineHeight = 5, MaxLines = 2 });
+			verticalStack.Add(new Label
+			{
+				FontSize = 24,
+				Text = "LinearGradient Text",
+				Background = new LinearGradientBrush(
+				new GradientStopCollection
+				{
+ 					new GradientStop(Colors.Green, 0),
+ 					new GradientStop(Colors.Blue, 1)
+				},
+				new Point(0, 0),
+				new Point(1, 0))
+			});
+			verticalStack.Add(new Label
+			{
+				Text = "RadialGradient",
+				Padding = new Thickness(30),
+				Background = new RadialGradientBrush(
+ 				new GradientStopCollection
+ 				{
+ 					new GradientStop(Colors.DarkBlue, 0),
+ 					new GradientStop(Colors.Yellow, 0.6f),
+ 					new GradientStop(Colors.LightPink, 1)
+ 				},
+ 				new Point(0.5, 0.5),
+ 				0.3f)
+			});
+      verticalStack.Add(new Editor { Text = "Start", HorizontalTextAlignment = TextAlignment.Start });
 			verticalStack.Add(new Editor { Text = "End", HorizontalTextAlignment = TextAlignment.End });
 			verticalStack.Add(new Editor { Text = "Center", HorizontalTextAlignment = TextAlignment.Center });
 
@@ -132,6 +193,8 @@ void SetupMauiLayout()
 			verticalStack.Add(new Button { Text = "CharacterSpacing" });
 			verticalStack.Add(new Button { CharacterSpacing = 8, Text = "CharacterSpacing" });
 
+			verticalStack.Add(new RedButton { Text = "Dynamically Registered" });
+
 			var checkbox = new CheckBox();
 			checkbox.CheckedChanged += (sender, e) =>
 			{
@@ -141,11 +204,17 @@ void SetupMauiLayout()
 			verticalStack.Add(new CheckBox { BackgroundColor = Colors.LightPink });
 			verticalStack.Add(new CheckBox { IsChecked = true, Color = Colors.Aquamarine });
 
-			verticalStack.Add(new Editor());
+			var editor = new Editor();
+			editor.Completed += (sender, args) =>
+			{
+				Debug.WriteLine($"Editor Completed");
+			};
+
+			verticalStack.Add(editor);
 			verticalStack.Add(new Editor { Text = "Editor" });
 			verticalStack.Add(new Editor { Text = "Lorem ipsum dolor sit amet", MaxLength = 10 });
 			verticalStack.Add(new Editor { Text = "Predictive Text Off", IsTextPredictionEnabled = false });
-			verticalStack.Add(new Editor { Text = "Lorem ipsum dolor sit amet", FontSize = 10, FontFamily = "dokdo_regular" });
+			verticalStack.Add(new Editor { Text = "Lorem ipsum dolor sit amet", FontSize = 10, FontFamily = "Dokdo" });
 			verticalStack.Add(new Editor { Text = "ReadOnly Editor", IsReadOnly = true });
 
 
@@ -172,13 +241,17 @@ void SetupMauiLayout()
 			verticalStack.Add(new ProgressBar { Progress = 0.5, BackgroundColor = Colors.LightCoral });
 			verticalStack.Add(new ProgressBar { Progress = 0.5, ProgressColor = Colors.Purple });
 
-			var searchBar = new SearchBar();
-			searchBar.CharacterSpacing = 4;
-			searchBar.Text = "A search query";
+			var searchBar = new SearchBar
+			{
+				CharacterSpacing = 4,
+				Text = "A search query"
+			};
 			verticalStack.Add(searchBar);
 
-			var placeholderSearchBar = new SearchBar();
-			placeholderSearchBar.Placeholder = "Placeholder";
+			var placeholderSearchBar = new SearchBar
+			{
+				Placeholder = "Placeholder"
+			};
 			verticalStack.Add(placeholderSearchBar);
 
 			var monkeyList = new List<string>
@@ -192,7 +265,7 @@ void SetupMauiLayout()
 				"Japanese Macaque"
 			};
 
-			var picker = new Picker { Title = "Select a monkey", FontFamily = "Dokdo",  HorizontalTextAlignment = TextAlignment.Center};
+			var picker = new Picker { Title = "Select a monkey", FontFamily = "Dokdo", HorizontalTextAlignment = TextAlignment.Center };
 
 			picker.ItemsSource = monkeyList;
 			verticalStack.Add(picker);
@@ -215,7 +288,8 @@ void SetupMauiLayout()
 			verticalStack.Add(new TimePicker());
 			verticalStack.Add(new TimePicker { Time = TimeSpan.FromHours(8), CharacterSpacing = 6 });
 
-			verticalStack.Add(new Image() { Source = "dotnet_bot.png" });
+			verticalStack.Add(new Label { Text = "IMAGES (static | animated):" });
+			verticalStack.Add(CreateImagesGrid());
 
 			Content = new ScrollView
 			{
@@ -223,6 +297,51 @@ void SetupMauiLayout()
 			};
 		}
 
+		Button CreateResizingButton()
+		{
+			var initialWidth = 200;
+			var otherWidth = 100;
+
+			var initialHeight = 80;
+			var otherHeight = 140;
+
+			var count = 1;
+
+			var resizeButton = new Button
+			{
+				Text = "Resize",
+				BackgroundColor = Colors.Gray,
+				WidthRequest = initialWidth,
+				HeightRequest = initialHeight
+			};
+
+			resizeButton.Clicked += (sender, args) =>
+			{
+
+				count += 1;
+
+				if (count == 1)
+				{
+					resizeButton.WidthRequest = initialWidth;
+					resizeButton.HeightRequest = initialHeight;
+				}
+				else if (count == 2)
+				{
+					resizeButton.WidthRequest = otherWidth;
+					resizeButton.HeightRequest = otherHeight;
+				}
+				else
+				{
+					// Go back to using whatever the layout gives us
+					resizeButton.WidthRequest = -1;
+					resizeButton.HeightRequest = -1;
+					count = 0;
+				}
+			};
+
+			return resizeButton;
+		}
+
 		void SetupCompatibilityLayout()
 		{
 			var verticalStack = new StackLayout() { Spacing = 5, BackgroundColor = Colors.AntiqueWhite };
@@ -262,6 +381,78 @@ void SetupCompatibilityLayout()
 			Content = verticalStack;
 		}
 
+		IView CreateImagesGrid()
+		{
+			var layout = new Microsoft.Maui.Controls.Layout2.GridLayout { ColumnSpacing = 10, RowSpacing = 10, Margin = 10 };
+
+			layout.AddRowDefinition(new RowDefinition { Height = GridLength.Auto });
+			layout.AddRowDefinition(new RowDefinition { Height = new GridLength(120) });
+			layout.AddRowDefinition(new RowDefinition { Height = GridLength.Auto });
+			layout.AddRowDefinition(new RowDefinition { Height = new GridLength(120) });
+			layout.AddRowDefinition(new RowDefinition { Height = GridLength.Auto });
+			layout.AddRowDefinition(new RowDefinition { Height = new GridLength(120) });
+			layout.AddRowDefinition(new RowDefinition { Height = GridLength.Auto });
+			layout.AddRowDefinition(new RowDefinition { Height = new GridLength(120) });
+			layout.AddRowDefinition(new RowDefinition { Height = GridLength.Auto });
+			layout.AddRowDefinition(new RowDefinition { Height = new GridLength(120) });
+
+			layout.AddColumnDefinition(new ColumnDefinition { Width = new GridLength(120) });
+			layout.AddColumnDefinition(new ColumnDefinition { Width = new GridLength(120) });
+
+			var row = -1;
+
+			Add(new Label { Text = "App Bundle", WidthRequest = 150 }, row: (row += 2) - 1, col: 0, colSpan: 2);
+			Add(new Image { Source = "dotnet_bot.png" }, row: row, col: 0);
+			Add(new Image { Source = "animated_heart.gif", IsAnimationPlaying = true }, row: row, col: 1);
+
+			Add(new Label { Text = "File", WidthRequest = 150 }, row: (row += 2) - 1, col: 0, colSpan: 2);
+			Add(new Image { Source = CopyLocal("dotnet_bot.png") }, row: row, col: 0);
+			Add(new Image { Source = CopyLocal("animated_heart.gif"), IsAnimationPlaying = true }, row: row, col: 1);
+
+			Add(new Label { Text = "Font", WidthRequest = 150 }, row: (row += 2) - 1, col: 0, colSpan: 2);
+			Add(new Image { Source = new FontImageSource { FontFamily = "Ionicons", Glyph = "\uf2fe" }, BackgroundColor = Color.FromUint(0xFF512BD4), Aspect = Aspect.Center }, row: row, col: 0);
+			Add(new Image { Source = new FontImageSource { FontFamily = "Dokdo", Glyph = "M" }, BackgroundColor = Color.FromUint(0xFF512BD4), Aspect = Aspect.Center }, row: row, col: 1);
+
+			Add(new Label { Text = "URI", WidthRequest = 150 }, row: (row += 2) - 1, col: 0, colSpan: 2);
+			Add(new Image { Source = "https://raw.githubusercontent.com/dotnet-foundation/swag/05cc70d33fa8c310147b9bd70ae9e103a072cae0/dotnet-bot/dotnet-bot-pot.png" }, row: row, col: 0);
+			Add(new Image { Source = "https://raw.githubusercontent.com/mono/SkiaSharp/6753bfad91dce1894c69084555dab6494efa90eb/samples/Gallery/Shared/Media/animated-heart.gif", IsAnimationPlaying = true }, row: row, col: 1);
+
+			Add(new Label { Text = "Stream", WidthRequest = 150 }, row: (row += 2) - 1, col: 0, colSpan: 2);
+			Add(new Image { Source = ImageSource.FromStream(() => GetEmbedded("dotnet_bot.png")) }, row: row, col: 0);
+			Add(new Image { Source = ImageSource.FromStream(() => GetEmbedded("animated_heart.gif")), IsAnimationPlaying = true }, row: row, col: 1);
+
+			return layout;
+
+			void Add(IView view, int row = 0, int col = 0, int rowSpan = 1, int colSpan = 1)
+			{
+				layout.Add(view);
+				layout.SetRow(view, row);
+				layout.SetRowSpan(view, rowSpan);
+				layout.SetColumn(view, col);
+				layout.SetColumnSpan(view, colSpan);
+			}
+
+			string CopyLocal(string embeddedPath)
+			{
+				var path = Path.Combine(FileSystem.CacheDirectory, Guid.NewGuid().ToString("N"));
+
+				using var stream = GetEmbedded(embeddedPath);
+				using var file = File.Create(path);
+				stream.CopyTo(file);
+
+				return path;
+			}
+
+			Stream GetEmbedded(string embeddedPath)
+			{
+				var assembly = GetType().Assembly;
+				var name = assembly
+					.GetManifestResourceNames()
+					.First(n => n.EndsWith(embeddedPath, StringComparison.InvariantCultureIgnoreCase));
+				return assembly.GetManifestResourceStream(name);
+			}
+		}
+
 		IView CreateSampleGrid()
 		{
 			var layout = new Microsoft.Maui.Controls.Layout2.GridLayout() { ColumnSpacing = 0, RowSpacing = 0 };
@@ -305,9 +496,9 @@ void AddTextResizeDemo(Microsoft.Maui.ILayout layout)
 			{
 				if (resizeTestLabel.Text == "Short Text")
 				{
-					resizeTestLabel.Text = loremIpsum;
-					explicitWidthTestLabel.Text = loremIpsum;
-					widthAndHeightTestLabel.Text = loremIpsum;
+					resizeTestLabel.Text = LoremIpsum;
+					explicitWidthTestLabel.Text = LoremIpsum;
+					widthAndHeightTestLabel.Text = LoremIpsum;
 				}
 				else
 				{
@@ -322,5 +513,49 @@ void AddTextResizeDemo(Microsoft.Maui.ILayout layout)
 			layout.Add(widthAndHeightTestLabel);
 			layout.Add(explicitWidthTestLabel);
 		}
+
+		void SetupVisibilityTest()
+		{
+			var layout = new VerticalStackLayout() { BackgroundColor = Colors.BurlyWood };
+
+			var button1 = new Button { Text = "Controls", Margin = new Thickness(0, 40) };
+
+			var button2 = new Button { Text = "MAUI" };
+
+			var controlsLabel = new Label { Text = "Controls Label" };
+			controlsLabel.IsVisible = true;
+
+			var alwaysVisible = new Label { Text = "Always visible" };
+
+			var mauiLabel = new VisibilityLabel() { Text = "Core Label" };
+
+			button1.Clicked += (sender, args) => {
+				controlsLabel.IsVisible = !controlsLabel.IsVisible;
+			};
+
+			button2.Clicked += (sender, args) =>
+			{
+				switch ((mauiLabel as IFrameworkElement).Visibility)
+				{
+					case Visibility.Visible:
+						mauiLabel.SetVisibility(Visibility.Hidden);
+						break;
+					case Visibility.Hidden:
+						mauiLabel.SetVisibility(Visibility.Collapsed);
+						break;
+					case Visibility.Collapsed:
+						mauiLabel.SetVisibility(Visibility.Visible);
+						break;
+				}
+			};
+
+			layout.Add(button1);
+			layout.Add(button2);
+			layout.Add(controlsLabel);
+			layout.Add(mauiLabel);
+			layout.Add(alwaysVisible);
+
+			Content = layout;
+		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Controls/samples/Controls.Sample/Pages/NavPage.cs b/src/Controls/samples/Controls.Sample/Pages/NavPage.cs
new file mode 100644
index 000000000000..37f72f1ba8d2
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample/Pages/NavPage.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Maui.Controls.Sample.ViewModel;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Graphics;
+
+namespace Maui.Controls.Sample.Pages
+{
+	public class NavPage : NavigationPage
+	{
+		public NavPage(IServiceProvider services, MainPageViewModel viewModel) :
+			base(new MainPage(services, viewModel))
+		{
+			ToolbarItems.Add(new ToolbarItem()
+			{
+				Text = "Nav Page"
+			});
+			BarBackgroundColor = Colors.Purple;
+			BarTextColor = Colors.Green;
+
+		}
+	}
+}
diff --git a/src/Controls/samples/Controls.Sample/Pages/SemanticsPage.xaml b/src/Controls/samples/Controls.Sample/Pages/SemanticsPage.xaml
index e720e8260783..405998af7322 100644
--- a/src/Controls/samples/Controls.Sample/Pages/SemanticsPage.xaml
+++ b/src/Controls/samples/Controls.Sample/Pages/SemanticsPage.xaml
@@ -1,7 +1,9 @@
 <controls:BasePage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
                    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
                    xmlns:controls="clr-namespace:Maui.Controls.Sample.Controls"
-                   x:Class="Maui.Controls.Sample.Pages.SemanticsPage">
+                   x:Class="Maui.Controls.Sample.Pages.SemanticsPage"
+                   Title="Semantics Page"
+                   BackgroundColor="White">
 
     <ScrollView Margin="15,20">
         <VerticalStackLayout>
@@ -38,6 +40,7 @@
             <Button
                 Text="Button text TH"
                 FontSize="14"
+                x:Name="pushButton"
                 HorizontalOptions="Center"
                 WidthRequest="200"
                 SemanticProperties.Hint="Hint text"/>
@@ -47,6 +50,7 @@
                 FontSize="14"
                 HorizontalOptions="CenterAndExpand"
                 WidthRequest="200"
+                x:Name="popButton"
                 SemanticProperties.Description="Description text"
                 SemanticProperties.Hint="Hint text"/>
 
@@ -178,4 +182,4 @@
         </VerticalStackLayout>
     </ScrollView>
 
-</controls:BasePage>
\ No newline at end of file
+</controls:BasePage>
diff --git a/src/Controls/samples/Controls.Sample/Pages/SemanticsPage.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/SemanticsPage.xaml.cs
index c5a9c60e56cc..dea8015add32 100644
--- a/src/Controls/samples/Controls.Sample/Pages/SemanticsPage.xaml.cs
+++ b/src/Controls/samples/Controls.Sample/Pages/SemanticsPage.xaml.cs
@@ -9,6 +9,18 @@ public partial class SemanticsPage : BasePage
 		public SemanticsPage()
 		{
 			InitializeComponent();
+			pushButton.Clicked += PushButton_Clicked;
+			popButton.Clicked += PopButton_Clicked;
+		}
+
+		private async void PopButton_Clicked(object sender, System.EventArgs e)
+		{
+			await Navigation.PopAsync();
+		}
+
+		private async void PushButton_Clicked(object sender, System.EventArgs e)
+		{
+			await Navigation.PushAsync(new SemanticsPage());
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample/Resources/Embedded/animated_heart.gif b/src/Controls/samples/Controls.Sample/Resources/Embedded/animated_heart.gif
new file mode 100644
index 000000000000..a7dfec7ea5cd
Binary files /dev/null and b/src/Controls/samples/Controls.Sample/Resources/Embedded/animated_heart.gif differ
diff --git a/src/Controls/samples/Controls.Sample/Resources/Embedded/dotnet_bot.png b/src/Controls/samples/Controls.Sample/Resources/Embedded/dotnet_bot.png
new file mode 100644
index 000000000000..1096e673e93e
Binary files /dev/null and b/src/Controls/samples/Controls.Sample/Resources/Embedded/dotnet_bot.png differ
diff --git a/src/Controls/samples/Controls.Sample/Resources/Fonts/LobsterTwo-Bold.ttf b/src/Controls/samples/Controls.Sample/Resources/Fonts/LobsterTwo-Bold.ttf
new file mode 100644
index 000000000000..2e979fbff2ca
Binary files /dev/null and b/src/Controls/samples/Controls.Sample/Resources/Fonts/LobsterTwo-Bold.ttf differ
diff --git a/src/Controls/samples/Controls.Sample/Resources/Fonts/LobsterTwo-BoldItalic.ttf b/src/Controls/samples/Controls.Sample/Resources/Fonts/LobsterTwo-BoldItalic.ttf
new file mode 100644
index 000000000000..8bbf8d827893
Binary files /dev/null and b/src/Controls/samples/Controls.Sample/Resources/Fonts/LobsterTwo-BoldItalic.ttf differ
diff --git a/src/Controls/samples/Controls.Sample/Resources/Fonts/LobsterTwo-Italic.ttf b/src/Controls/samples/Controls.Sample/Resources/Fonts/LobsterTwo-Italic.ttf
new file mode 100644
index 000000000000..b88ec1723c6c
Binary files /dev/null and b/src/Controls/samples/Controls.Sample/Resources/Fonts/LobsterTwo-Italic.ttf differ
diff --git a/src/Controls/samples/Controls.Sample/Resources/Fonts/LobsterTwo-Regular.ttf b/src/Controls/samples/Controls.Sample/Resources/Fonts/LobsterTwo-Regular.ttf
new file mode 100644
index 000000000000..556c45e7d1d6
Binary files /dev/null and b/src/Controls/samples/Controls.Sample/Resources/Fonts/LobsterTwo-Regular.ttf differ
diff --git a/src/Controls/samples/Controls.Sample/Resources/Images/animated_heart.gif b/src/Controls/samples/Controls.Sample/Resources/Images/animated_heart.gif
new file mode 100644
index 000000000000..a7dfec7ea5cd
Binary files /dev/null and b/src/Controls/samples/Controls.Sample/Resources/Images/animated_heart.gif differ
diff --git a/src/Controls/samples/Controls.Sample/Resources/Raw/index.html b/src/Controls/samples/Controls.Sample/Resources/Raw/index.html
new file mode 100644
index 000000000000..86396e5ab248
--- /dev/null
+++ b/src/Controls/samples/Controls.Sample/Resources/Raw/index.html
@@ -0,0 +1,5 @@
+<html>
+ <body>
+   <h1>Hello, this is embedded web content!<h1>
+ </body>
+</html>
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample/Startup.cs b/src/Controls/samples/Controls.Sample/Startup.cs
index be6fc64ed4e1..a2510fb352c1 100644
--- a/src/Controls/samples/Controls.Sample/Startup.cs
+++ b/src/Controls/samples/Controls.Sample/Startup.cs
@@ -8,46 +8,56 @@
 using Microsoft.AspNetCore.Components.WebView.Maui;
 #endif
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Maui;
 using Microsoft.Maui.Controls.Compatibility;
+using Microsoft.Maui.Controls.Hosting;
 using Microsoft.Maui.Essentials;
 using Microsoft.Maui.Hosting;
 using Microsoft.Maui.LifecycleEvents;
+using Microsoft.Maui.Controls;
+using Maui.Controls.Sample.Controls;
 
 namespace Maui.Controls.Sample
 {
 	public class Startup : IStartup
 	{
-		enum PageType { Xaml, Semantics, Main, Blazor }
-		private PageType _pageType = PageType.Main;
+		enum PageType { Xaml, Semantics, Main, Blazor, NavigationPage }
+		private PageType _pageType = PageType.NavigationPage;
 
 		public readonly static bool UseXamlApp = true;
+		public readonly static bool UseFullDI = false;
 
 		public void Configure(IAppHostBuilder appBuilder)
 		{
+			appBuilder
+				.UseFormsCompatibility()
+				.UseMauiControlsHandlers();
+
 			if (UseXamlApp)
-			{
-				// Use all the Forms features
-				appBuilder = appBuilder
-					.UseFormsCompatibility()
-					.UseMauiApp<XamlApp>();
-			}
+				appBuilder.UseMauiApp<XamlApp>();
+			else
+				appBuilder.UseMauiApp<MyApp>();
+
+			if (UseFullDI)
+				appBuilder.UseServiceProviderFactory(new DIExtensionsServiceProviderFactory());
 			else
-			{
-				// Use just the Forms renderers
-				appBuilder = appBuilder
-					.UseCompatibilityRenderers()
-					.UseMauiApp<MyApp>();
-			}
-#if DEBUG
+				appBuilder.UseMauiServiceProviderFactory(true);
+
+			// Use a "third party" library that brings in a massive amount of controls
+			appBuilder.UseRed();
+
+#if DEBUG && !WINDOWS
 			appBuilder.EnableHotReload();
 #endif
-			appBuilder
+
 #if NET6_0_OR_GREATER
-				.RegisterBlazorMauiWebView()
+			appBuilder.RegisterBlazorMauiWebView();
 #endif
+
+			appBuilder
 				.ConfigureAppConfiguration(config =>
 				{
 					config.AddInMemoryCollection(new Dictionary<string, string>
@@ -58,17 +68,29 @@ public void Configure(IAppHostBuilder appBuilder)
 						{"Logging:LogLevel:Default", "Warning"}
 					});
 				})
-				.UseMauiServiceProviderFactory(true)
-				//.UseServiceProviderFactory(new DIExtensionsServiceProviderFactory())
 				.ConfigureServices(services =>
 				{
+					// The MAUI DI does not support generic argument resolution
+					if (UseFullDI)
+					{
+						services.AddLogging(logging =>
+						{
+#if WINDOWS
+							logging.AddDebug();
+#else
+							logging.AddConsole();
+#endif
+						});
+					}
+
 					services.AddSingleton<ITextService, TextService>();
 					services.AddTransient<MainPageViewModel>();
 
 					services.AddTransient(
-						serviceType: typeof(IPage),
+						serviceType: typeof(Page),
 						implementationType: _pageType switch
 						{
+							PageType.NavigationPage => typeof(NavPage),
 							PageType.Xaml => typeof(XamlPage),
 							PageType.Semantics => typeof(SemanticsPage),
 							PageType.Blazor =>
@@ -81,24 +103,29 @@ public void Configure(IAppHostBuilder appBuilder)
 							_ => throw new Exception(),
 						});
 
-					services.AddTransient<IWindow, MainWindow>();
+					services.AddTransient<IWindow, Window>();
 				})
 				.ConfigureFonts(fonts =>
 				{
 					fonts.AddFont("Dokdo-Regular.ttf", "Dokdo");
+					fonts.AddFont("LobsterTwo-Regular.ttf", "Lobster Two");
+					fonts.AddFont("LobsterTwo-Bold.ttf", "Lobster Two Bold");
+					fonts.AddFont("LobsterTwo-Italic.ttf", "Lobster Two Italic");
+					fonts.AddFont("LobsterTwo-BoldItalic.ttf", "Lobster Two BoldItalic");
+					fonts.AddFont("ionicons.ttf", "Ionicons");
+				})
+				.ConfigureEssentials(essentials =>
+				{
+					essentials
+						.UseVersionTracking()
+						.UseMapServiceToken("YOUR-KEY-HERE")
+						.AddAppAction("test_action", "Test App Action")
+						.AddAppAction("second_action", "Second App Action")
+						.OnAppAction(appAction =>
+						{
+							Debug.WriteLine($"You seem to have arrived from a special place: {appAction.Title} ({appAction.Id})");
+						});
 				})
-				//.ConfigureEssentials(essentials =>
-				//{
-				//	essentials
-				//		.UseVersionTracking()
-				//		.UseMapServiceToken("YOUR-KEY-HERE")
-				//		.AddAppAction("test_action", "Test App Action")
-				//		.AddAppAction("second_action", "Second App Action")
-				//		.OnAppAction(appAction =>
-				//		{
-				//			Debug.WriteLine($"You seem to have arrived from a special place: {appAction.Title} ({appAction.Id})");
-				//		});
-				//})
 				.ConfigureLifecycleEvents(events =>
 				{
 					events.AddEvent<Action<string>>("CustomEventName", value => LogEvent("CustomEventName"));
diff --git a/src/Controls/samples/Controls.Sample/XamlApp.xaml b/src/Controls/samples/Controls.Sample/XamlApp.xaml
index de18c1a09d65..a230d2d36b39 100644
--- a/src/Controls/samples/Controls.Sample/XamlApp.xaml
+++ b/src/Controls/samples/Controls.Sample/XamlApp.xaml
@@ -1,7 +1,9 @@
 <Application xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:local="clr-namespace:Maui.Controls.Sample"
-             x:Class="Maui.Controls.Sample.XamlApp">
+             xmlns:windows="clr-namespace:Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific;assembly=Microsoft.Maui.Controls"
+             x:Class="Maui.Controls.Sample.XamlApp"
+             windows:Application.ImageDirectory="Assets">
     <Application.Resources>
         <ResourceDictionary>
             <Color x:Key="DotNetPurple">#512BD4</Color>
diff --git a/src/Controls/samples/Controls.Sample/XamlApp.xaml.cs b/src/Controls/samples/Controls.Sample/XamlApp.xaml.cs
index b4da61fc8266..fbfa681541c8 100644
--- a/src/Controls/samples/Controls.Sample/XamlApp.xaml.cs
+++ b/src/Controls/samples/Controls.Sample/XamlApp.xaml.cs
@@ -21,10 +21,9 @@ public XamlApp(IServiceProvider services, ITextService textService)
 
 		public IServiceProvider Services { get; }
 
-		public override IWindow CreateWindow(IActivationState activationState)
+		protected override IWindow CreateWindow(IActivationState activationState)
 		{
 			Microsoft.Maui.Controls.Compatibility.Forms.Init(activationState);
-
 			return Services.GetRequiredService<IWindow>();
 		}
 	}
diff --git a/src/Controls/src/Build.Tasks/Controls.Build.Tasks-net6.csproj b/src/Controls/src/Build.Tasks/Controls.Build.Tasks-net6.csproj
index 672a9f9f7a76..46c175c393b9 100644
--- a/src/Controls/src/Build.Tasks/Controls.Build.Tasks-net6.csproj
+++ b/src/Controls/src/Build.Tasks/Controls.Build.Tasks-net6.csproj
@@ -23,15 +23,13 @@
 
 	<ItemGroup>
 		<PackageReference Include="Mono.Cecil" Version="0.11.3" PrivateAssets="all" GeneratePathProperty="true" />
-    <PackageReference Include="System.CodeDom" Version="4.7.0" Condition="'$(TargetFramework)' == 'netstandard2.0'" GeneratePathProperty="true" />
-		<PackageReference Include="System.CodeDom" Version="6.0.0-preview.2.21110.7" PrivateAssets="all" Condition="'$(TargetFramework)' == 'net6.0'" />
+		<PackageReference Include="System.CodeDom" Version="4.7.0" PrivateAssets="all" GeneratePathProperty="true" />
 		<PackageReference Include="Microsoft.Build" Version="15.9.20" PrivateAssets="all" />
 		<PackageReference Include="Microsoft.Build.Framework" Version="15.9.20" PrivateAssets="all" />
 		<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.9.20" PrivateAssets="all" />
 		<PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.9.20" PrivateAssets="all" />
 		<PackageReference Include="Microsoft.Maui.Graphics" GeneratePathProperty="true" />
 		<!-- <PackageReference Include="StrongNamer" Version="0.2.5" PrivateAssets="all" GeneratePathProperty="true" /> -->
-		<PackageReference Include="XliffTasks" Version="1.0.0-beta.21110.1" PrivateAssets="all" />
 	</ItemGroup>
 
 	<PropertyGroup>
@@ -57,17 +55,13 @@
 		<None Include="$(PkgMono_Cecil)\lib\netstandard2.0\Mono.Cecil.Mdb.dll" Visible="False" Pack="True" PackagePath="buildTransitive" />
 		<None Include="$(PkgMono_Cecil)\lib\netstandard2.0\Mono.Cecil.Pdb.dll" Visible="False" Pack="True" PackagePath="buildTransitive" />
 		<None Include="$(PkgMono_Cecil)\lib\netstandard2.0\Mono.Cecil.Rocks.dll" Visible="False" Pack="True" PackagePath="buildTransitive" />
-    <None Include="$(PkgSystem_CodeDom)\lib\netstandard2.0\System.CodeDom.dll" Visible="False" Pack="True" PackagePath="buildTransitive" />
+		<None Include="$(PkgSystem_CodeDom)\lib\netstandard2.0\System.CodeDom.dll" Visible="False" Pack="True" PackagePath="buildTransitive" />
 
 		<None Include="..\Core\bin\$(Configuration)\netstandard2.0\Microsoft.Maui.dll" Visible="False" Pack="True" PackagePath="buildTransitive" />
 		<None Include="..\Core\bin\$(Configuration)\netstandard2.0\Microsoft.Maui.Controls.dll" Visible="False" Pack="True" PackagePath="buildTransitive" />
 		<None Include="..\Xaml\bin\$(Configuration)\netstandard2.0\Microsoft.Maui.Controls.Xaml.dll" Visible="False" Pack="True" PackagePath="buildTransitive" />
 	</ItemGroup>
 
-	<PropertyGroup>
-		 <UpdateXlfOnBuild Condition="'$(CI)' != 'true'">true</UpdateXlfOnBuild>
-	</PropertyGroup>
-
 	<ItemGroup>
 		<ProjectReference Include="..\Core\Controls.Core-net6.csproj" PrivateAssets="all" />
 		<ProjectReference Include="..\Xaml\Controls.Xaml-net6.csproj" PrivateAssets="all" />
diff --git a/src/Controls/src/Build.Tasks/Controls.Build.Tasks.csproj b/src/Controls/src/Build.Tasks/Controls.Build.Tasks.csproj
index 229a376882a6..c9467423f549 100644
--- a/src/Controls/src/Build.Tasks/Controls.Build.Tasks.csproj
+++ b/src/Controls/src/Build.Tasks/Controls.Build.Tasks.csproj
@@ -28,7 +28,6 @@
 		<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.9.20" PrivateAssets="all" />
 		<PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.9.20" PrivateAssets="all" />
 		<!-- <PackageReference Include="StrongNamer" Version="0.2.5" PrivateAssets="all" GeneratePathProperty="true" /> -->
-		<PackageReference Include="XliffTasks" Version="1.0.0-beta.21110.1" PrivateAssets="all" />
 	</ItemGroup>
 
 	<PropertyGroup>
@@ -58,10 +57,6 @@
 		<None Include="..\Xaml\bin\$(Configuration)\net6.0\Microsoft.Maui.Controls.Xaml.dll" Visible="False" Pack="True" PackagePath="buildTransitive" />
 	</ItemGroup>
 
-	<PropertyGroup>
-		 <UpdateXlfOnBuild Condition="'$(CI)' != 'true'">true</UpdateXlfOnBuild>
-	</PropertyGroup>
-
 	<ItemGroup>
 		<ProjectReference Include="..\Core\Controls.Core.csproj" PrivateAssets="all" />
 		<ProjectReference Include="..\Xaml\Controls.Xaml.csproj" PrivateAssets="all" />
diff --git a/src/Controls/src/Build.Tasks/xlf/ErrorMessages.cs.resx b/src/Controls/src/Build.Tasks/xlf/ErrorMessages.cs.resx
new file mode 100644
index 000000000000..027b175bbd99
--- /dev/null
+++ b/src/Controls/src/Build.Tasks/xlf/ErrorMessages.cs.resx
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="AdderMissing" xml:space="preserve">
+    <value>Pro {0}{1} není nadefinovaná žádná metoda Add().</value>
+    <comment>0 is type name, 1 is property name</comment>
+  </data>
+  <data name="BindingIndexerEmpty" xml:space="preserve">
+    <value>Vazba: Indexer neobsahoval argumenty.</value>
+  </data>
+  <data name="BindingIndexerNotClosed" xml:space="preserve">
+    <value>Vazba: Indexer neobsahoval pravou hranatou závorku.</value>
+  </data>
+  <data name="BindingIndexerParse" xml:space="preserve">
+    <value>Vazba: {0} nejde analyzovat jako index pro vlastnost {1}.</value>
+    <comment>0 is indexer value, 1 is property name</comment>
+  </data>
+  <data name="BindingIndexerTypeUnsupported" xml:space="preserve">
+    <value>Vazba: Nepodporovaný typ indexu indexeru: {0}</value>
+    <comment>0 is indexer type name</comment>
+  </data>
+  <data name="BindingPropertyNotFound" xml:space="preserve">
+    <value>Vazba: Vlastnost {0} nejde u typu {1} najít.</value>
+    <comment>0 is property name, 1 is type name</comment>
+  </data>
+  <data name="BPMissingGetter" xml:space="preserve">
+    <value>Chybí veřejná statická metoda Get{0} nebo metoda getter veřejné vlastnosti instance pro připojenou vlastnost {1}.{0}Property.</value>
+    <comment>0 is BindableProperty name, 1 is the declaring type</comment>
+  </data>
+  <data name="BPName" xml:space="preserve">
+    <value>Název vlastnosti {0} typu BindableProperty nekončí na Property.</value>
+    <comment>0 is BindableProperty name</comment>
+  </data>
+  <data name="ConstructorDefaultMissing" xml:space="preserve">
+    <value>Chybí výchozí konstruktor pro typ {0}.</value>
+    <comment>0 is type name</comment>
+  </data>
+  <data name="ConstructorXArgsMissing" xml:space="preserve">
+    <value>Chybí konstruktor pro typ {0} s odpovídajícím atributem x:Arguments.</value>
+    <comment>0 is type name</comment>
+  </data>
+  <data name="ContentPropertyAttributeMissing" xml:space="preserve">
+    <value>Nejde nastavit obsah typu {0}, protože nemá atribut [ContentProperty].</value>
+    <comment>0 is type name</comment>
+  </data>
+  <data name="Conversion" xml:space="preserve">
+    <value>Hodnotu {0} nejde převést na typ {1}.</value>
+    <comment>0 is a value, 1 is a type</comment>
+  </data>
+  <data name="EnumValueMissing" xml:space="preserve">
+    <value>Pro hodnotu {0} nešlo najít hodnotu výčtu.</value>
+    <comment>0 is enum value</comment>
+  </data>
+  <data name="InvalidXaml" xml:space="preserve">
+    <value>Neplatný kód XAML: {0}</value>
+    <comment>0 is the invalid xaml snippet</comment>
+  </data>
+  <data name="MarkupNotClosed" xml:space="preserve">
+    <value>Výraz značky není uzavřený.</value>
+  </data>
+  <data name="MarkupParsingFailed" xml:space="preserve">
+    <value>Při analýze výrazu značky došlo k chybě.</value>
+  </data>
+  <data name="MemberResolution" xml:space="preserve">
+    <value>Pro člen {0} nešlo najít žádnou vlastnost, BindableProperty nebo událost nebo došlo k neshodě typu mezi hodnotou a vlastností.</value>
+    <comment>0 is member name</comment>
+  </data>
+  <data name="MethodStaticMissing" xml:space="preserve">
+    <value>Pro {0}::{1} ({2}) se nenašla žádná statická metoda.</value>
+    <comment>0 is type name, 1 is methodname, 2 is type arg list</comment>
+  </data>
+  <data name="MissingEventHandler" xml:space="preserve">
+    <value>V typu {1} nešlo najít obslužnou rutinu událostí {0} se správnou signaturou.</value>
+    <comment>0 is the handler name, 1 is the declaring type</comment>
+  </data>
+  <data name="NamescopeDuplicate" xml:space="preserve">
+    <value>Element s názvem {0} už v tomto oboru názvů existuje.</value>
+    <comment>0 is the duplicated key</comment>
+  </data>
+  <data name="PropertyMissing" xml:space="preserve">
+    <value>Chybí povinná vlastnost {0} pro typ {1}.</value>
+    <comment>0 is a property name, 1 is a type</comment>
+  </data>
+  <data name="PropertyResolution" xml:space="preserve">
+    <value>Nejde přeložit vlastnost {0} pro typ {1} (vlastnost chybí nebo chybí přístupové objekty).</value>
+    <comment>0 is a property name, 1 is a type name</comment>
+  </data>
+  <data name="ResourceDictDuplicateKey" xml:space="preserve">
+    <value>Prostředek s klíčem {0} už v ResourceDictionary existuje.</value>
+    <comment>0 is key name</comment>
+  </data>
+  <data name="ResourceDictMissingKey" xml:space="preserve">
+    <value>Prostředky v ResourceDictionary vyžadují atribut x:Key.</value>
+  </data>
+  <data name="ResourceMissing" xml:space="preserve">
+    <value>Prostředek {0} se nenašel.</value>
+    <comment>0 is a resourceId</comment>
+  </data>
+  <data name="SByteEnums" xml:space="preserve">
+    <value>Výčty s více hodnotami nejsou platné pro typy výčtu sbyte.</value>
+  </data>
+  <data name="StyleSheetNoSourceOrContent" xml:space="preserve">
+    <value>Šablona stylů vyžaduje buď zdroj, nebo obsah.</value>
+  </data>
+  <data name="StyleSheetSourceNotALiteral" xml:space="preserve">
+    <value>Zdrojová vlastnost není řetězcový literál.</value>
+  </data>
+  <data name="StyleSheetSourceOrContent" xml:space="preserve">
+    <value>Šablona stylů nemůže obsahovat jak zdroj, tak obsah.</value>
+  </data>
+  <data name="StyleSheetStyleNotALiteral" xml:space="preserve">
+    <value>Vlastnost Style nebo obsah není řetězcový literál.</value>
+  </data>
+  <data name="TypeResolution" xml:space="preserve">
+    <value>Typ {0} nejde přeložit.</value>
+    <comment>0 is a type name</comment>
+  </data>
+  <data name="XDataTypeSyntax" xml:space="preserve">
+    <value>x:DataType očekává řetězcový literál, značku {{x:Type}} nebo {{x:Nul}l}.</value>
+  </data>
+  <data name="XmlnsUndeclared" xml:space="preserve">
+    <value>Nedeklarovaná předpona xmlns: {0}</value>
+    <comment>0 is the xmlns prefix</comment>
+  </data>
+  <data name="XStaticResolution" xml:space="preserve">
+    <value>x:Static: nejde najít veřejné nebo přístupné interní statické pole, statickou vlastnost, konstantu nebo hodnotu výčtu s názvem {0} v typu {1}.</value>
+    <comment>0 is membername, 1 is type name</comment>
+  </data>
+  <data name="XStaticSyntax" xml:space="preserve">
+    <value>Syntaxe pro x:Static je [Člen=][předpona:]názevTypu.názevStatickéhoČlenu.</value>
+  </data>
+  <data name="XKeyNotLiteral" xml:space="preserve">
+    <value>x:Key očekává řetězcový literál.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Controls/src/Build.Tasks/xlf/ErrorMessages.de.resx b/src/Controls/src/Build.Tasks/xlf/ErrorMessages.de.resx
new file mode 100644
index 000000000000..5188c521bb24
--- /dev/null
+++ b/src/Controls/src/Build.Tasks/xlf/ErrorMessages.de.resx
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="AdderMissing" xml:space="preserve">
+    <value>Für "{0}{1}" wurde keine Add()-Methode definiert.</value>
+    <comment>0 is type name, 1 is property name</comment>
+  </data>
+  <data name="BindingIndexerEmpty" xml:space="preserve">
+    <value>Bindung: Der Indexer enthielt keine Argumente.</value>
+  </data>
+  <data name="BindingIndexerNotClosed" xml:space="preserve">
+    <value>Bindung: Der Indexer enthielt keine schließende Klammer.</value>
+  </data>
+  <data name="BindingIndexerParse" xml:space="preserve">
+    <value>Bindung: "{0}" kann nicht als Index für "{1}" analysiert werden.</value>
+    <comment>0 is indexer value, 1 is property name</comment>
+  </data>
+  <data name="BindingIndexerTypeUnsupported" xml:space="preserve">
+    <value>Binding: nicht unterstützter Indexer-Indextyp: "{0}".</value>
+    <comment>0 is indexer type name</comment>
+  </data>
+  <data name="BindingPropertyNotFound" xml:space="preserve">
+    <value>Bindung: Die Eigenschaft "{0}" wurde in "{1}" nicht gefunden.</value>
+    <comment>0 is property name, 1 is type name</comment>
+  </data>
+  <data name="BPMissingGetter" xml:space="preserve">
+    <value>Es fehlt eine Methode "public static Get{0}" oder ein Eigenschaftengetter der öffentlichen Instanz für die angefügte Eigenschaft "{1}.{0}Property".</value>
+    <comment>0 is BindableProperty name, 1 is the declaring type</comment>
+  </data>
+  <data name="BPName" xml:space="preserve">
+    <value>Der Name der BindableProperty "{0}" endet nicht mit "Property".</value>
+    <comment>0 is BindableProperty name</comment>
+  </data>
+  <data name="ConstructorDefaultMissing" xml:space="preserve">
+    <value>Fehlender Standardkonstruktor für "{0}".</value>
+    <comment>0 is type name</comment>
+  </data>
+  <data name="ConstructorXArgsMissing" xml:space="preserve">
+    <value>Fehlender Konstruktor für "{0}" mit übereinstimmendem Attribut "x:Arguments".</value>
+    <comment>0 is type name</comment>
+  </data>
+  <data name="ContentPropertyAttributeMissing" xml:space="preserve">
+    <value>Der Inhalt von "{0}" kann nicht festgelegt werden, weil kein [ContentProperty]-Attribut vorhanden ist.</value>
+    <comment>0 is type name</comment>
+  </data>
+  <data name="Conversion" xml:space="preserve">
+    <value>Der Wert "{0}" kann nicht in "{1}" konvertiert werden.</value>
+    <comment>0 is a value, 1 is a type</comment>
+  </data>
+  <data name="EnumValueMissing" xml:space="preserve">
+    <value>Der Enumerationswert für "{0}" wurde nicht gefunden.</value>
+    <comment>0 is enum value</comment>
+  </data>
+  <data name="InvalidXaml" xml:space="preserve">
+    <value>Ungültiger XAML-Codeausschnitt "{0}".</value>
+    <comment>0 is the invalid xaml snippet</comment>
+  </data>
+  <data name="MarkupNotClosed" xml:space="preserve">
+    <value>Der Markupausdruck wurde nicht geschlossen.</value>
+  </data>
+  <data name="MarkupParsingFailed" xml:space="preserve">
+    <value>Fehler beim Analysieren des Markupausdrucks.</value>
+  </data>
+  <data name="MemberResolution" xml:space="preserve">
+    <value>Für "{0}" wurde keine Eigenschaft, keine BindableProperty oder kein Ereignis gefunden, oder es gibt eine Typdiskrepanz zwischen Wert und Eigenschaft.</value>
+    <comment>0 is member name</comment>
+  </data>
+  <data name="MethodStaticMissing" xml:space="preserve">
+    <value>Für "{0}::{1} ({2})" wurde keine statische Methode gefunden.</value>
+    <comment>0 is type name, 1 is methodname, 2 is type arg list</comment>
+  </data>
+  <data name="MissingEventHandler" xml:space="preserve">
+    <value>Der EventHandler "{0}" mit der richtigen Signatur wurde im Typ "{1}" nicht gefunden.</value>
+    <comment>0 is the handler name, 1 is the declaring type</comment>
+  </data>
+  <data name="NamescopeDuplicate" xml:space="preserve">
+    <value>Ein Element mit dem Namen "{0}" ist in diesem NameScope bereits vorhanden.</value>
+    <comment>0 is the duplicated key</comment>
+  </data>
+  <data name="PropertyMissing" xml:space="preserve">
+    <value>Die erforderliche Eigenschaft "{0}" für "{1}" fehlt.</value>
+    <comment>0 is a property name, 1 is a type</comment>
+  </data>
+  <data name="PropertyResolution" xml:space="preserve">
+    <value>Die Eigenschaft "{0}" für den Typ "{1} (Eigenschaft fehlt oder fehlende Accessoren)" kann nicht aufgelöst werden.</value>
+    <comment>0 is a property name, 1 is a type name</comment>
+  </data>
+  <data name="ResourceDictDuplicateKey" xml:space="preserve">
+    <value>"Eine Ressource mit dem Schlüssel "{0}" ist im ResourceDictionary bereits vorhanden.</value>
+    <comment>0 is key name</comment>
+  </data>
+  <data name="ResourceDictMissingKey" xml:space="preserve">
+    <value>Die Ressourcen im ResourceDictionary erfordern ein x:Key-Attribut.</value>
+  </data>
+  <data name="ResourceMissing" xml:space="preserve">
+    <value>Die Ressource "{0}" wurde nicht gefunden.</value>
+    <comment>0 is a resourceId</comment>
+  </data>
+  <data name="SByteEnums" xml:space="preserve">
+    <value>Mehrwertige Enumerationen sind für sbyte-Enumerationstypen ungültig.</value>
+  </data>
+  <data name="StyleSheetNoSourceOrContent" xml:space="preserve">
+    <value>Das StyleSheet erfordert entweder eine Source-Eigenschaft oder einen Inhalt.</value>
+  </data>
+  <data name="StyleSheetSourceNotALiteral" xml:space="preserve">
+    <value>Die Source-Eigenschaft ist kein Zeichenfolgenliteral.</value>
+  </data>
+  <data name="StyleSheetSourceOrContent" xml:space="preserve">
+    <value>Das StyleSheet kann nicht gleichzeitig eine Source-Eigenschaft und einen Inhalt aufweisen.</value>
+  </data>
+  <data name="StyleSheetStyleNotALiteral" xml:space="preserve">
+    <value>Die Style-Eigenschaft oder der Inhalt ist kein Zeichenfolgenliteral.</value>
+  </data>
+  <data name="TypeResolution" xml:space="preserve">
+    <value>Der Typ "{0}" kann nicht aufgelöst werden.</value>
+    <comment>0 is a type name</comment>
+  </data>
+  <data name="XDataTypeSyntax" xml:space="preserve">
+    <value>x:DataType erwartet ein Zeichenfolgenliteral, ein {{x:Type}}-Markup oder {{x:Nul}l}.</value>
+  </data>
+  <data name="XmlnsUndeclared" xml:space="preserve">
+    <value>Nicht deklariertes xmlns-Präfix "{0}".</value>
+    <comment>0 is the xmlns prefix</comment>
+  </data>
+  <data name="XStaticResolution" xml:space="preserve">
+    <value>x:Static: Ein öffentliches – oder zugängliches internes – statisches Feld, eine statische Eigenschaft oder ein const- oder enum-Wert mit dem Namen "{0}" wurde in "{1}" nicht gefunden.</value>
+    <comment>0 is membername, 1 is type name</comment>
+  </data>
+  <data name="XStaticSyntax" xml:space="preserve">
+    <value>Die Syntax für "x:Static" lautet "[Member=][prefix:]typeName.staticMemberName".</value>
+  </data>
+  <data name="XKeyNotLiteral" xml:space="preserve">
+    <value>Für "x:Key" wird ein Zeichenfolgenliteral erwartet.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Controls/src/Build.Tasks/xlf/ErrorMessages.es.resx b/src/Controls/src/Build.Tasks/xlf/ErrorMessages.es.resx
new file mode 100644
index 000000000000..f175a0f30b1d
--- /dev/null
+++ b/src/Controls/src/Build.Tasks/xlf/ErrorMessages.es.resx
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="AdderMissing" xml:space="preserve">
+    <value>No se ha definido ningún método Add() en "{0}{1}".</value>
+    <comment>0 is type name, 1 is property name</comment>
+  </data>
+  <data name="BindingIndexerEmpty" xml:space="preserve">
+    <value>Enlace: el indizador no contenía argumentos.</value>
+  </data>
+  <data name="BindingIndexerNotClosed" xml:space="preserve">
+    <value>Enlace: el indizador no contenía un corchete de cierre.</value>
+  </data>
+  <data name="BindingIndexerParse" xml:space="preserve">
+    <value>Enlace: no se puede analizar "{0}" como un índice para "{1}".</value>
+    <comment>0 is indexer value, 1 is property name</comment>
+  </data>
+  <data name="BindingIndexerTypeUnsupported" xml:space="preserve">
+    <value>Enlace: tipo de índice del indizador no admitido: "{0}".</value>
+    <comment>0 is indexer type name</comment>
+  </data>
+  <data name="BindingPropertyNotFound" xml:space="preserve">
+    <value>Enlace: no se encontró la propiedad "{0}" en "{1}".</value>
+    <comment>0 is property name, 1 is type name</comment>
+  </data>
+  <data name="BPMissingGetter" xml:space="preserve">
+    <value>Falta un método "public static Get{0}" o un captador de propiedad de instancia pública para la propiedad adjunta "{1}.{0}Property".</value>
+    <comment>0 is BindableProperty name, 1 is the declaring type</comment>
+  </data>
+  <data name="BPName" xml:space="preserve">
+    <value>El nombre de BindableProperty {0} no termina con "Property".</value>
+    <comment>0 is BindableProperty name</comment>
+  </data>
+  <data name="ConstructorDefaultMissing" xml:space="preserve">
+    <value>Falta el constructor predeterminado para "{0}".</value>
+    <comment>0 is type name</comment>
+  </data>
+  <data name="ConstructorXArgsMissing" xml:space="preserve">
+    <value>Falta un constructor para "{0}" con x:Arguments coincidentes.</value>
+    <comment>0 is type name</comment>
+  </data>
+  <data name="ContentPropertyAttributeMissing" xml:space="preserve">
+    <value>No se puede establecer el contenido de "{0}" porque no tiene un atributo [ContentProperty].</value>
+    <comment>0 is type name</comment>
+  </data>
+  <data name="Conversion" xml:space="preserve">
+    <value>No se puede convertir el valor "{0}" en "{1}".</value>
+    <comment>0 is a value, 1 is a type</comment>
+  </data>
+  <data name="EnumValueMissing" xml:space="preserve">
+    <value>No se encontró el valor de enumeración para "{0}".</value>
+    <comment>0 is enum value</comment>
+  </data>
+  <data name="InvalidXaml" xml:space="preserve">
+    <value>XAML no válido "{0}".</value>
+    <comment>0 is the invalid xaml snippet</comment>
+  </data>
+  <data name="MarkupNotClosed" xml:space="preserve">
+    <value>Expresión de marcado no cerrada.</value>
+  </data>
+  <data name="MarkupParsingFailed" xml:space="preserve">
+    <value>Error al analizar la expresión de marcado.</value>
+  </data>
+  <data name="MemberResolution" xml:space="preserve">
+    <value>No se encontró ninguna propiedad, BindableProperty o evento para "{0}", o el tipo entre el valor y la propiedad no coincide.</value>
+    <comment>0 is member name</comment>
+  </data>
+  <data name="MethodStaticMissing" xml:space="preserve">
+    <value>No se encontró ningún método estático para "{0}::{1} ({2})".</value>
+    <comment>0 is type name, 1 is methodname, 2 is type arg list</comment>
+  </data>
+  <data name="MissingEventHandler" xml:space="preserve">
+    <value>No se encontró el elemento EventHandler "{0}" con la signatura correcta en el tipo "{1}".</value>
+    <comment>0 is the handler name, 1 is the declaring type</comment>
+  </data>
+  <data name="NamescopeDuplicate" xml:space="preserve">
+    <value>Ya existe un elemento con el nombre "{0}" en este elemento NameScope.</value>
+    <comment>0 is the duplicated key</comment>
+  </data>
+  <data name="PropertyMissing" xml:space="preserve">
+    <value>Falta la propiedad obligatoria "{0}" en "{1}".</value>
+    <comment>0 is a property name, 1 is a type</comment>
+  </data>
+  <data name="PropertyResolution" xml:space="preserve">
+    <value>No se puede resolver la propiedad "{0}" del tipo "{1} (falta la propiedad o faltan los descriptores de acceso)".</value>
+    <comment>0 is a property name, 1 is a type name</comment>
+  </data>
+  <data name="ResourceDictDuplicateKey" xml:space="preserve">
+    <value>Ya hay un recurso con la clave "{0}" en ResourceDictionary.</value>
+    <comment>0 is key name</comment>
+  </data>
+  <data name="ResourceDictMissingKey" xml:space="preserve">
+    <value>Los recursos de ResourceDictionary requieren un atributo x:Key.</value>
+  </data>
+  <data name="ResourceMissing" xml:space="preserve">
+    <value>No se encontró el recurso "{0}".</value>
+    <comment>0 is a resourceId</comment>
+  </data>
+  <data name="SByteEnums" xml:space="preserve">
+    <value>Las enumeraciones con varios valores no son válidas en los tipos de enumeración SByte.</value>
+  </data>
+  <data name="StyleSheetNoSourceOrContent" xml:space="preserve">
+    <value>StyleSheet requiere un origen o un contenido.</value>
+  </data>
+  <data name="StyleSheetSourceNotALiteral" xml:space="preserve">
+    <value>La propiedad Source no es un literal de cadena.</value>
+  </data>
+  <data name="StyleSheetSourceOrContent" xml:space="preserve">
+    <value>StyleSheet no puede tener un origen y un contenido.</value>
+  </data>
+  <data name="StyleSheetStyleNotALiteral" xml:space="preserve">
+    <value>La propiedad Style o Content no es un literal de cadena.</value>
+  </data>
+  <data name="TypeResolution" xml:space="preserve">
+    <value>No se puede resolver el tipo "{0}".</value>
+    <comment>0 is a type name</comment>
+  </data>
+  <data name="XDataTypeSyntax" xml:space="preserve">
+    <value>x:DataType espera un literal de cadena, una marca {{x:Type}} o {{x:Nul}l}.</value>
+  </data>
+  <data name="XmlnsUndeclared" xml:space="preserve">
+    <value>Prefijo xmlns no declarado "{0}".</value>
+    <comment>0 is the xmlns prefix</comment>
+  </data>
+  <data name="XStaticResolution" xml:space="preserve">
+    <value>x:Static: no puede encontrar un campo estático público (o interno accesible), una propiedad estática o un valor constante o de enumeración llamados "{0}" en "{1}".</value>
+    <comment>0 is membername, 1 is type name</comment>
+  </data>
+  <data name="XStaticSyntax" xml:space="preserve">
+    <value>La sintaxis de x:Static es "[Member=][prefix:]typeName.staticMemberName".</value>
+  </data>
+  <data name="XKeyNotLiteral" xml:space="preserve">
+    <value>x:Clave espera un literal de cadena.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Controls/src/Build.Tasks/xlf/ErrorMessages.fr.resx b/src/Controls/src/Build.Tasks/xlf/ErrorMessages.fr.resx
new file mode 100644
index 000000000000..793cec9e7c91
--- /dev/null
+++ b/src/Controls/src/Build.Tasks/xlf/ErrorMessages.fr.resx
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="AdderMissing" xml:space="preserve">
+    <value>Aucune méthode Add() définie sur "{0}{1}".</value>
+    <comment>0 is type name, 1 is property name</comment>
+  </data>
+  <data name="BindingIndexerEmpty" xml:space="preserve">
+    <value>Liaison : l'indexeur ne contient pas d'arguments.</value>
+  </data>
+  <data name="BindingIndexerNotClosed" xml:space="preserve">
+    <value>Liaison : l'indexeur ne contient pas de crochet fermant.</value>
+  </data>
+  <data name="BindingIndexerParse" xml:space="preserve">
+    <value>Liaison : "{0}" ne peut pas être analysé en tant qu'index pour "{1}".</value>
+    <comment>0 is indexer value, 1 is property name</comment>
+  </data>
+  <data name="BindingIndexerTypeUnsupported" xml:space="preserve">
+    <value>Liaison : type d'index d'indexeur non pris en charge : "{0}".</value>
+    <comment>0 is indexer type name</comment>
+  </data>
+  <data name="BindingPropertyNotFound" xml:space="preserve">
+    <value>Liaison : propriété "{0}" introuvable sur "{1}".</value>
+    <comment>0 is property name, 1 is type name</comment>
+  </data>
+  <data name="BPMissingGetter" xml:space="preserve">
+    <value>Il manque une méthode "public static Get{0}" ou un getter de propriété d'instance publique pour la propriété jointe "{1}.{0}Property".</value>
+    <comment>0 is BindableProperty name, 1 is the declaring type</comment>
+  </data>
+  <data name="BPName" xml:space="preserve">
+    <value>Le nom du BindableProperty {0} ne finit pas par "Property".</value>
+    <comment>0 is BindableProperty name</comment>
+  </data>
+  <data name="ConstructorDefaultMissing" xml:space="preserve">
+    <value>Constructeur par défaut manquant pour "{0}".</value>
+    <comment>0 is type name</comment>
+  </data>
+  <data name="ConstructorXArgsMissing" xml:space="preserve">
+    <value>Constructeur manquant pour "{0}" avec un x:Arguments correspondant.</value>
+    <comment>0 is type name</comment>
+  </data>
+  <data name="ContentPropertyAttributeMissing" xml:space="preserve">
+    <value>Impossible de définir le contenu de "{0}", car il n'a pas d'attribut [ContentProperty].</value>
+    <comment>0 is type name</comment>
+  </data>
+  <data name="Conversion" xml:space="preserve">
+    <value>Impossible de convertir la valeur "{0}" en "{1}".</value>
+    <comment>0 is a value, 1 is a type</comment>
+  </data>
+  <data name="EnumValueMissing" xml:space="preserve">
+    <value>Valeur enum introuvable pour "{0}".</value>
+    <comment>0 is enum value</comment>
+  </data>
+  <data name="InvalidXaml" xml:space="preserve">
+    <value>Extrait XAML "{0}" non valide.</value>
+    <comment>0 is the invalid xaml snippet</comment>
+  </data>
+  <data name="MarkupNotClosed" xml:space="preserve">
+    <value>Expression de balise non fermée.</value>
+  </data>
+  <data name="MarkupParsingFailed" xml:space="preserve">
+    <value>Erreur durant l'analyse de l'expression de balise.</value>
+  </data>
+  <data name="MemberResolution" xml:space="preserve">
+    <value>Propriété, BindableProperty ou événement introuvable pour "{0}", ou type incompatible entre la valeur et la propriété.</value>
+    <comment>0 is member name</comment>
+  </data>
+  <data name="MethodStaticMissing" xml:space="preserve">
+    <value>Méthode statique introuvable pour "{0}::{1} ({2})".</value>
+    <comment>0 is type name, 1 is methodname, 2 is type arg list</comment>
+  </data>
+  <data name="MissingEventHandler" xml:space="preserve">
+    <value>Impossible de localiser un EventHandler "{0}" avec une signature correcte dans le type "{1}".</value>
+    <comment>0 is the handler name, 1 is the declaring type</comment>
+  </data>
+  <data name="NamescopeDuplicate" xml:space="preserve">
+    <value>Un élément nommé "{0}" existe déjà dans ce NameScope.</value>
+    <comment>0 is the duplicated key</comment>
+  </data>
+  <data name="PropertyMissing" xml:space="preserve">
+    <value>Propriété obligatoire "{0}" manquante sur "{1}".</value>
+    <comment>0 is a property name, 1 is a type</comment>
+  </data>
+  <data name="PropertyResolution" xml:space="preserve">
+    <value>Impossible de résoudre la propriété "{0}" sur le type "{1} (propriété manquante ou accesseurs manquants)".</value>
+    <comment>0 is a property name, 1 is a type name</comment>
+  </data>
+  <data name="ResourceDictDuplicateKey" xml:space="preserve">
+    <value>"Une ressource avec la clé "{0}" est déjà présente dans ResourceDictionary.</value>
+    <comment>0 is key name</comment>
+  </data>
+  <data name="ResourceDictMissingKey" xml:space="preserve">
+    <value>Les ressources de ResourceDictionary nécessitent un attribut x:Key.</value>
+  </data>
+  <data name="ResourceMissing" xml:space="preserve">
+    <value>Ressource "{0}" introuvable.</value>
+    <comment>0 is a resourceId</comment>
+  </data>
+  <data name="SByteEnums" xml:space="preserve">
+    <value>Les enums à valeurs multiples sont non valides sur les types enum sbyte.</value>
+  </data>
+  <data name="StyleSheetNoSourceOrContent" xml:space="preserve">
+    <value>StyleSheet nécessite Source ou un contenu.</value>
+  </data>
+  <data name="StyleSheetSourceNotALiteral" xml:space="preserve">
+    <value>La propriété Source n'est pas un littéral de chaîne.</value>
+  </data>
+  <data name="StyleSheetSourceOrContent" xml:space="preserve">
+    <value>StyleSheet ne peut pas avoir à la fois Source et un contenu.</value>
+  </data>
+  <data name="StyleSheetStyleNotALiteral" xml:space="preserve">
+    <value>La propriété Style ou le contenu n'est pas un littéral de chaîne.</value>
+  </data>
+  <data name="TypeResolution" xml:space="preserve">
+    <value>Impossible de résoudre le type "{0}".</value>
+    <comment>0 is a type name</comment>
+  </data>
+  <data name="XDataTypeSyntax" xml:space="preserve">
+    <value>x:DataType attend un littéral de chaîne, une balise {{x:Type}} ou {{x:Nul}l}.</value>
+  </data>
+  <data name="XmlnsUndeclared" xml:space="preserve">
+    <value>Préfixe xmlns non déclaré "{0}".</value>
+    <comment>0 is the xmlns prefix</comment>
+  </data>
+  <data name="XStaticResolution" xml:space="preserve">
+    <value>x:Static : impossible de localiser un champ statique public (ou interne et accessible), une propriété statique, une valeur const ou une valeur enum portant le nom "{0}" dans "{1}".</value>
+    <comment>0 is membername, 1 is type name</comment>
+  </data>
+  <data name="XStaticSyntax" xml:space="preserve">
+    <value>La syntaxe de x:Static est "[Member=][prefix:]typeName.staticMemberName".</value>
+  </data>
+  <data name="XKeyNotLiteral" xml:space="preserve">
+    <value>x:Key attend un littéral de chaîne.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Controls/src/Build.Tasks/xlf/ErrorMessages.it.resx b/src/Controls/src/Build.Tasks/xlf/ErrorMessages.it.resx
new file mode 100644
index 000000000000..8648543cc726
--- /dev/null
+++ b/src/Controls/src/Build.Tasks/xlf/ErrorMessages.it.resx
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="AdderMissing" xml:space="preserve">
+    <value>Non è stato definito alcun metodo Add() in "{0}{1}".</value>
+    <comment>0 is type name, 1 is property name</comment>
+  </data>
+  <data name="BindingIndexerEmpty" xml:space="preserve">
+    <value>Associazione: l'indicizzatore non contiene argomenti.</value>
+  </data>
+  <data name="BindingIndexerNotClosed" xml:space="preserve">
+    <value>Associazione: l'indicizzatore non contiene la parentesi quadra di chiusura.</value>
+  </data>
+  <data name="BindingIndexerParse" xml:space="preserve">
+    <value>Associazione: non è possibile analizzare "{0}" come indice di una proprietà "{1}".</value>
+    <comment>0 is indexer value, 1 is property name</comment>
+  </data>
+  <data name="BindingIndexerTypeUnsupported" xml:space="preserve">
+    <value>Associazione: il tipo di indice "{0}" dell'indicizzatore non è supportato.</value>
+    <comment>0 is indexer type name</comment>
+  </data>
+  <data name="BindingPropertyNotFound" xml:space="preserve">
+    <value>Associazione: la proprietà "{0}" non è stata trovata in "{1}".</value>
+    <comment>0 is property name, 1 is type name</comment>
+  </data>
+  <data name="BPMissingGetter" xml:space="preserve">
+    <value>Manca un metodo "public static Get{0}" o un getter di proprietà di istanza pubblica per la proprietà associata "{1}.{0}Property".</value>
+    <comment>0 is BindableProperty name, 1 is the declaring type</comment>
+  </data>
+  <data name="BPName" xml:space="preserve">
+    <value>Il nome dell'elemento BindableProperty {0} non termina con "Property".</value>
+    <comment>0 is BindableProperty name</comment>
+  </data>
+  <data name="ConstructorDefaultMissing" xml:space="preserve">
+    <value>Manca il costruttore predefinito per "{0}".</value>
+    <comment>0 is type name</comment>
+  </data>
+  <data name="ConstructorXArgsMissing" xml:space="preserve">
+    <value>Manca il costruttore per "{0}" con attributo x:Arguments corrispondente.</value>
+    <comment>0 is type name</comment>
+  </data>
+  <data name="ContentPropertyAttributeMissing" xml:space="preserve">
+    <value>Non è possibile impostare il contenuto di "{0}" perché non include un attributo [ContentProperty].</value>
+    <comment>0 is type name</comment>
+  </data>
+  <data name="Conversion" xml:space="preserve">
+    <value>Non è possibile convertire il valore "{0}" in "{1}".</value>
+    <comment>0 is a value, 1 is a type</comment>
+  </data>
+  <data name="EnumValueMissing" xml:space="preserve">
+    <value>Valore di enumerazione non trovato per "{0}".</value>
+    <comment>0 is enum value</comment>
+  </data>
+  <data name="InvalidXaml" xml:space="preserve">
+    <value>XAML "{0}" non valido.</value>
+    <comment>0 is the invalid xaml snippet</comment>
+  </data>
+  <data name="MarkupNotClosed" xml:space="preserve">
+    <value>Espressione di markup non chiusa.</value>
+  </data>
+  <data name="MarkupParsingFailed" xml:space="preserve">
+    <value>Si è verificato un errore durante l'analisi dell'espressione di markup.</value>
+  </data>
+  <data name="MemberResolution" xml:space="preserve">
+    <value>Non sono stati trovati eventi, proprietà o elementi BindableProperty per "{0}" oppure il tipo di valore e proprietà non corrispondono.</value>
+    <comment>0 is member name</comment>
+  </data>
+  <data name="MethodStaticMissing" xml:space="preserve">
+    <value>Non è stato trovato alcun metodo statico per "{0}::{1} ({2})".</value>
+    <comment>0 is type name, 1 is methodname, 2 is type arg list</comment>
+  </data>
+  <data name="MissingEventHandler" xml:space="preserve">
+    <value>Nel tipo "{1}" non è stato trovato alcun elemento EventHandler "{0}" con la firma corretta.</value>
+    <comment>0 is the handler name, 1 is the declaring type</comment>
+  </data>
+  <data name="NamescopeDuplicate" xml:space="preserve">
+    <value>In questo elemento NameScope esiste già un elemento denominato "{0}".</value>
+    <comment>0 is the duplicated key</comment>
+  </data>
+  <data name="PropertyMissing" xml:space="preserve">
+    <value>In "{1}" manca la proprietà obbligatoria "{0}".</value>
+    <comment>0 is a property name, 1 is a type</comment>
+  </data>
+  <data name="PropertyResolution" xml:space="preserve">
+    <value>Non è possibile risolvere la proprietà "{0}" nel tipo "{1} (funzioni di accesso o proprietà mancanti)".</value>
+    <comment>0 is a property name, 1 is a type name</comment>
+  </data>
+  <data name="ResourceDictDuplicateKey" xml:space="preserve">
+    <value>"Una risorsa con chiave "{0}" è già presente in ResourceDictionary.</value>
+    <comment>0 is key name</comment>
+  </data>
+  <data name="ResourceDictMissingKey" xml:space="preserve">
+    <value>Per le risorse in ResourceDictionary è richiesto un attributo x:Key.</value>
+  </data>
+  <data name="ResourceMissing" xml:space="preserve">
+    <value>La risorsa "{0}" non è stata trovata.</value>
+    <comment>0 is a resourceId</comment>
+  </data>
+  <data name="SByteEnums" xml:space="preserve">
+    <value>Le enumerazioni con valori multipli non sono valide nei tipi enumerazione sbyte.</value>
+  </data>
+  <data name="StyleSheetNoSourceOrContent" xml:space="preserve">
+    <value>Con l'elemento StyleSheet è richiesto un elemento Source o contenuto.</value>
+  </data>
+  <data name="StyleSheetSourceNotALiteral" xml:space="preserve">
+    <value>La proprietà di origine non è un valore letterale stringa.</value>
+  </data>
+  <data name="StyleSheetSourceOrContent" xml:space="preserve">
+    <value>Un elemento StyleSheet non può includere sia un elemento Source che contenuto.</value>
+  </data>
+  <data name="StyleSheetStyleNotALiteral" xml:space="preserve">
+    <value>La proprietà Style o l'elemento Content non è un valore letterale stringa.</value>
+  </data>
+  <data name="TypeResolution" xml:space="preserve">
+    <value>Non è possibile risolvere il tipo "{0}".</value>
+    <comment>0 is a type name</comment>
+  </data>
+  <data name="XDataTypeSyntax" xml:space="preserve">
+    <value>Con x:DataType è previsto un valore letterale stringa, un markup {{x:Type}} oppure {{x:Nul}l}.</value>
+  </data>
+  <data name="XmlnsUndeclared" xml:space="preserve">
+    <value>Il prefisso xmlns "{0}" non è dichiarato.</value>
+    <comment>0 is the xmlns prefix</comment>
+  </data>
+  <data name="XStaticResolution" xml:space="preserve">
+    <value>x:Static: non è possibile trovare un valore di campo statico pubblico o interno accessibile, di proprietà statica, di costante o di enumerazione denominato "{0}" in "{1}".</value>
+    <comment>0 is membername, 1 is type name</comment>
+  </data>
+  <data name="XStaticSyntax" xml:space="preserve">
+    <value>La sintassi di x:Static è "[Membro=][prefisso:]nomeTipo.nomeMembroStatico".</value>
+  </data>
+  <data name="XKeyNotLiteral" xml:space="preserve">
+    <value>x:Key prevede un valore letterale stringa.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Controls/src/Build.Tasks/xlf/ErrorMessages.ja.resx b/src/Controls/src/Build.Tasks/xlf/ErrorMessages.ja.resx
new file mode 100644
index 000000000000..ec5c7e2fcb48
--- /dev/null
+++ b/src/Controls/src/Build.Tasks/xlf/ErrorMessages.ja.resx
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="AdderMissing" xml:space="preserve">
+    <value>Add() メソッドが "{0}{1}" に定義されていません。</value>
+    <comment>0 is type name, 1 is property name</comment>
+  </data>
+  <data name="BindingIndexerEmpty" xml:space="preserve">
+    <value>バインド: インデクサーに引数が含まれていませんでした。</value>
+  </data>
+  <data name="BindingIndexerNotClosed" xml:space="preserve">
+    <value>バインド: インデクサーに右角かっこが含まれていませんでした。</value>
+  </data>
+  <data name="BindingIndexerParse" xml:space="preserve">
+    <value>バインド: "{0}" は、"{1}" のインデックスとして解析できません。</value>
+    <comment>0 is indexer value, 1 is property name</comment>
+  </data>
+  <data name="BindingIndexerTypeUnsupported" xml:space="preserve">
+    <value>バインド: サポートされていない種類のインデクサーのインデックスです: "{0}"。</value>
+    <comment>0 is indexer type name</comment>
+  </data>
+  <data name="BindingPropertyNotFound" xml:space="preserve">
+    <value>バインド: プロパティ "{0}" が "{1}" に見つかりません。</value>
+    <comment>0 is property name, 1 is type name</comment>
+  </data>
+  <data name="BPMissingGetter" xml:space="preserve">
+    <value>添付プロパティ "{1}. {0}Property" の "public static Get{0}" メソッドまたはパブリック インスタンス プロパティ ゲッターがありません。</value>
+    <comment>0 is BindableProperty name, 1 is the declaring type</comment>
+  </data>
+  <data name="BPName" xml:space="preserve">
+    <value>BindableProperty {0} の名前の末尾が "Property" ではありません。</value>
+    <comment>0 is BindableProperty name</comment>
+  </data>
+  <data name="ConstructorDefaultMissing" xml:space="preserve">
+    <value>"{0}" の既定のコンストラクターがありません。</value>
+    <comment>0 is type name</comment>
+  </data>
+  <data name="ConstructorXArgsMissing" xml:space="preserve">
+    <value>一致する x:Arguments を持つ "{0}" のコンストラクターがありません。</value>
+    <comment>0 is type name</comment>
+  </data>
+  <data name="ContentPropertyAttributeMissing" xml:space="preserve">
+    <value>[ContentProperty] 属性がないため、"{0}" の内容を設定できません。</value>
+    <comment>0 is type name</comment>
+  </data>
+  <data name="Conversion" xml:space="preserve">
+    <value>値 "{0}" を "{1}" に変換できません。</value>
+    <comment>0 is a value, 1 is a type</comment>
+  </data>
+  <data name="EnumValueMissing" xml:space="preserve">
+    <value>"{0}" の列挙値が見つかりません。</value>
+    <comment>0 is enum value</comment>
+  </data>
+  <data name="InvalidXaml" xml:space="preserve">
+    <value>Xaml "{0}" が無効です。</value>
+    <comment>0 is the invalid xaml snippet</comment>
+  </data>
+  <data name="MarkupNotClosed" xml:space="preserve">
+    <value>マークアップ式が閉じられていません。</value>
+  </data>
+  <data name="MarkupParsingFailed" xml:space="preserve">
+    <value>マークアップ式の解析中にエラーが発生しました。</value>
+  </data>
+  <data name="MemberResolution" xml:space="preserve">
+    <value>"{0}" のプロパティ、BindableProperty、またはイベントが見つからないか、値とプロパティの型が一致しません。</value>
+    <comment>0 is member name</comment>
+  </data>
+  <data name="MethodStaticMissing" xml:space="preserve">
+    <value>"{0}::{1} ({2})" の静的メソッドが見つかりません。</value>
+    <comment>0 is type name, 1 is methodname, 2 is type arg list</comment>
+  </data>
+  <data name="MissingEventHandler" xml:space="preserve">
+    <value>正しいシグネチャを持つ EventHandler "{0}" が型 "{1}" に見つかりません。</value>
+    <comment>0 is the handler name, 1 is the declaring type</comment>
+  </data>
+  <data name="NamescopeDuplicate" xml:space="preserve">
+    <value>この NameScope には、"{0}" という名前の要素が既に存在します。</value>
+    <comment>0 is the duplicated key</comment>
+  </data>
+  <data name="PropertyMissing" xml:space="preserve">
+    <value>"{1}" の必須プロパティ "{0}" がありません。</value>
+    <comment>0 is a property name, 1 is a type</comment>
+  </data>
+  <data name="PropertyResolution" xml:space="preserve">
+    <value>型 "{1}" のプロパティ"{0}"を解決できません (プロパティが見つからないか、アクセサーがありません)。</value>
+    <comment>0 is a property name, 1 is a type name</comment>
+  </data>
+  <data name="ResourceDictDuplicateKey" xml:space="preserve">
+    <value>キーが "{0}"のリソースは、ResourceDictionary 内に既に存在します。</value>
+    <comment>0 is key name</comment>
+  </data>
+  <data name="ResourceDictMissingKey" xml:space="preserve">
+    <value>ResourceDictionary 内のリソースには x:Key 属性が必要です。</value>
+  </data>
+  <data name="ResourceMissing" xml:space="preserve">
+    <value>リソース "{0}" が見つかりません。</value>
+    <comment>0 is a resourceId</comment>
+  </data>
+  <data name="SByteEnums" xml:space="preserve">
+    <value>複数の値を持つ列挙型は、sbyte 列挙型では無効です。</value>
+  </data>
+  <data name="StyleSheetNoSourceOrContent" xml:space="preserve">
+    <value>スタイルシートには、ソースまたはコンテンツのどちらかが必要です。</value>
+  </data>
+  <data name="StyleSheetSourceNotALiteral" xml:space="preserve">
+    <value>ソース プロパティは文字列リテラルではありません。</value>
+  </data>
+  <data name="StyleSheetSourceOrContent" xml:space="preserve">
+    <value>スタイルシートにソースとコンテンツの両方を含めることはできません。</value>
+  </data>
+  <data name="StyleSheetStyleNotALiteral" xml:space="preserve">
+    <value>スタイル プロパティまたはコンテンツが文字列リテラルではありません。</value>
+  </data>
+  <data name="TypeResolution" xml:space="preserve">
+    <value>型 "{0}" を解決できません。</value>
+    <comment>0 is a type name</comment>
+  </data>
+  <data name="XDataTypeSyntax" xml:space="preserve">
+    <value>x:DataType には、文字列リテラル、{{x:Type}} マークアップ、または {{x:Nul}l} を指定する必要があります。</value>
+  </data>
+  <data name="XmlnsUndeclared" xml:space="preserve">
+    <value>宣言されていない xmlns プレフィックス "{0}" です。</value>
+    <comment>0 is the xmlns prefix</comment>
+  </data>
+  <data name="XStaticResolution" xml:space="preserve">
+    <value>x:Static: "{1}" に、"{0}" という名前のパブリックな (またはアクセス可能な内部の) 静的フィールド、静的プロパティ、const、または列挙値が見つかりません。</value>
+    <comment>0 is membername, 1 is type name</comment>
+  </data>
+  <data name="XStaticSyntax" xml:space="preserve">
+    <value>X:Static の構文が、"[Member=][prefix:]typeName.staticMemberName" です。</value>
+  </data>
+  <data name="XKeyNotLiteral" xml:space="preserve">
+    <value>x:Key には文字列リテラルが期待されています。</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Controls/src/Build.Tasks/xlf/ErrorMessages.ko.resx b/src/Controls/src/Build.Tasks/xlf/ErrorMessages.ko.resx
new file mode 100644
index 000000000000..7dfd7de990ca
--- /dev/null
+++ b/src/Controls/src/Build.Tasks/xlf/ErrorMessages.ko.resx
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="AdderMissing" xml:space="preserve">
+    <value>"{0}{1}"에 대한 Add() 메서드가 정의되지 않았습니다.</value>
+    <comment>0 is type name, 1 is property name</comment>
+  </data>
+  <data name="BindingIndexerEmpty" xml:space="preserve">
+    <value>바인딩: 인덱서에 인수가 없습니다.</value>
+  </data>
+  <data name="BindingIndexerNotClosed" xml:space="preserve">
+    <value>바인딩: 인덱서에 닫는 대괄호가 없습니다.</value>
+  </data>
+  <data name="BindingIndexerParse" xml:space="preserve">
+    <value>바인딩: "{0}"을(를) "{1}"의 인덱스로 구문 분석할 수 없습니다.</value>
+    <comment>0 is indexer value, 1 is property name</comment>
+  </data>
+  <data name="BindingIndexerTypeUnsupported" xml:space="preserve">
+    <value>바인딩: 지원되지 않는 인덱서 인덱스 형식: "{0}"</value>
+    <comment>0 is indexer type name</comment>
+  </data>
+  <data name="BindingPropertyNotFound" xml:space="preserve">
+    <value>바인딩: "{1}"에서 "{0}" 속성을 찾을 수 없습니다.</value>
+    <comment>0 is property name, 1 is type name</comment>
+  </data>
+  <data name="BPMissingGetter" xml:space="preserve">
+    <value>연결된 속성 "{1}.{0}Property"에 대한 "public static Get{0}" 메서드나 public 인스턴스 속성 getter가 없습니다.</value>
+    <comment>0 is BindableProperty name, 1 is the declaring type</comment>
+  </data>
+  <data name="BPName" xml:space="preserve">
+    <value>BindableProperty {0}의 이름은 "Property"로 끝나지 않습니다.</value>
+    <comment>0 is BindableProperty name</comment>
+  </data>
+  <data name="ConstructorDefaultMissing" xml:space="preserve">
+    <value>"{0}"에 대한 기본 생성자가 없습니다.</value>
+    <comment>0 is type name</comment>
+  </data>
+  <data name="ConstructorXArgsMissing" xml:space="preserve">
+    <value>일치하는 x:Arguments가 있는 "{0}"에 대한 생성자가 없습니다.</value>
+    <comment>0 is type name</comment>
+  </data>
+  <data name="ContentPropertyAttributeMissing" xml:space="preserve">
+    <value>"{0}"에 [ContentProperty] 특성이 없기 때문에 내용을 설정할 수 없습니다.</value>
+    <comment>0 is type name</comment>
+  </data>
+  <data name="Conversion" xml:space="preserve">
+    <value>값 "{0}"을 "{1}"(으)로 변환할 수 없습니다.</value>
+    <comment>0 is a value, 1 is a type</comment>
+  </data>
+  <data name="EnumValueMissing" xml:space="preserve">
+    <value>"{0}"에 대한 열거형 값을 찾을 수 없습니다.</value>
+    <comment>0 is enum value</comment>
+  </data>
+  <data name="InvalidXaml" xml:space="preserve">
+    <value>유효하지 않은 Xaml "{0}"입니다.</value>
+    <comment>0 is the invalid xaml snippet</comment>
+  </data>
+  <data name="MarkupNotClosed" xml:space="preserve">
+    <value>태그 식을 닫지 않았습니다.</value>
+  </data>
+  <data name="MarkupParsingFailed" xml:space="preserve">
+    <value>태그 식을 구문 분석하는 동안 오류가 발생했습니다.</value>
+  </data>
+  <data name="MemberResolution" xml:space="preserve">
+    <value>"{0}"에 대해 속성, BindableProperty 또는 이벤트를 찾을 수 없거나 값과 속성 간에 형식이 일치하는 않습니다.</value>
+    <comment>0 is member name</comment>
+  </data>
+  <data name="MethodStaticMissing" xml:space="preserve">
+    <value>"{0}::{1}({2})"에 대한 정적 메서드를 찾을 수 없습니다.</value>
+    <comment>0 is type name, 1 is methodname, 2 is type arg list</comment>
+  </data>
+  <data name="MissingEventHandler" xml:space="preserve">
+    <value>"{1}" 형식에서 올바른 서명이 포함된 EventHandler "{0}"을(를) 찾을 수 없습니다.</value>
+    <comment>0 is the handler name, 1 is the declaring type</comment>
+  </data>
+  <data name="NamescopeDuplicate" xml:space="preserve">
+    <value>이름이 "{0}"인 요소가 이 NameScope에 이미 있습니다.</value>
+    <comment>0 is the duplicated key</comment>
+  </data>
+  <data name="PropertyMissing" xml:space="preserve">
+    <value>"{1}"에 필수 속성 "{0}"이(가) 없습니다.</value>
+    <comment>0 is a property name, 1 is a type</comment>
+  </data>
+  <data name="PropertyResolution" xml:space="preserve">
+    <value>"{1}" 형식에서 속성 "{0}"을(를) 확인할 수 없습니다(속성이 누락되었거나 접근자가 누락됨).</value>
+    <comment>0 is a property name, 1 is a type name</comment>
+  </data>
+  <data name="ResourceDictDuplicateKey" xml:space="preserve">
+    <value>키가 "{0}"인 리소스가 ResourceDictionary에 이미 있습니다.</value>
+    <comment>0 is key name</comment>
+  </data>
+  <data name="ResourceDictMissingKey" xml:space="preserve">
+    <value>ResourceDictionary의 리소스에는 x:Key 특성이 필요합니다.</value>
+  </data>
+  <data name="ResourceMissing" xml:space="preserve">
+    <value>리소스 "{0}"을(를) 찾을 수 없습니다.</value>
+    <comment>0 is a resourceId</comment>
+  </data>
+  <data name="SByteEnums" xml:space="preserve">
+    <value>다중 값 열거형은 sbyte 열거형 형식에서 사용할 수 없습니다.</value>
+  </data>
+  <data name="StyleSheetNoSourceOrContent" xml:space="preserve">
+    <value>스타일 시트에는 원본 또는 콘텐츠가 필요합니다.</value>
+  </data>
+  <data name="StyleSheetSourceNotALiteral" xml:space="preserve">
+    <value>원본 속성이 문자열 리터럴이 아닙니다.</value>
+  </data>
+  <data name="StyleSheetSourceOrContent" xml:space="preserve">
+    <value>스타일 시트는 소스와 콘텐츠 중 하나만 포함할 수 있습니다.</value>
+  </data>
+  <data name="StyleSheetStyleNotALiteral" xml:space="preserve">
+    <value>스타일 속성 또는 콘텐츠가 문자열 리터럴이 아닙니다.</value>
+  </data>
+  <data name="TypeResolution" xml:space="preserve">
+    <value>형식 "{0}"을(를) 확인할 수 없습니다.</value>
+    <comment>0 is a type name</comment>
+  </data>
+  <data name="XDataTypeSyntax" xml:space="preserve">
+    <value>x:DataType에는 {{x:Type}} 태그 또는 {{x:Nul}l} 문자열 리터럴이 필요합니다.</value>
+  </data>
+  <data name="XmlnsUndeclared" xml:space="preserve">
+    <value>선언되지 않은 xmlns 접두사 "{0}"입니다.</value>
+    <comment>0 is the xmlns prefix</comment>
+  </data>
+  <data name="XStaticResolution" xml:space="preserve">
+    <value>x:Static: "{1}"에서 이름이 "{0}"인 public 또는 액세스 가능한 내부 정적 필드, 정적 속성, 상수 또는 열거형 값을 찾을 수 없습니다.</value>
+    <comment>0 is membername, 1 is type name</comment>
+  </data>
+  <data name="XStaticSyntax" xml:space="preserve">
+    <value>X:Static에 대한 구문은 "[Member=][prefix:]typeName.staticMemberName"입니다.</value>
+  </data>
+  <data name="XKeyNotLiteral" xml:space="preserve">
+    <value>x:Key는 문자열 리터럴을 기대합니다.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Controls/src/Build.Tasks/xlf/ErrorMessages.pl.resx b/src/Controls/src/Build.Tasks/xlf/ErrorMessages.pl.resx
new file mode 100644
index 000000000000..e4a2cd6851bd
--- /dev/null
+++ b/src/Controls/src/Build.Tasks/xlf/ErrorMessages.pl.resx
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="AdderMissing" xml:space="preserve">
+    <value>Nie zdefiniowano metody Add() dla elementu „{0}{1}”.</value>
+    <comment>0 is type name, 1 is property name</comment>
+  </data>
+  <data name="BindingIndexerEmpty" xml:space="preserve">
+    <value>Powiązanie: indeksator nie zawierał argumentów.</value>
+  </data>
+  <data name="BindingIndexerNotClosed" xml:space="preserve">
+    <value>Powiązanie: indeksator nie zawierał nawiasu zamykającego.</value>
+  </data>
+  <data name="BindingIndexerParse" xml:space="preserve">
+    <value>Powiązanie: nie można przeanalizować wartości „{0}” jako indeksu dla właściwości „{1}”.</value>
+    <comment>0 is indexer value, 1 is property name</comment>
+  </data>
+  <data name="BindingIndexerTypeUnsupported" xml:space="preserve">
+    <value>Powiązanie: nieobsługiwany typ indeksu indeksatora: „{0}”.</value>
+    <comment>0 is indexer type name</comment>
+  </data>
+  <data name="BindingPropertyNotFound" xml:space="preserve">
+    <value>Powiązanie: nie znaleziono właściwości „{0}” w typie „{1}”.</value>
+    <comment>0 is property name, 1 is type name</comment>
+  </data>
+  <data name="BPMissingGetter" xml:space="preserve">
+    <value>Brak metody „public static get{0}” lub metody pobierającej właściwość wystąpienia publicznego dla dołączonej właściwości „{1}.{0}Property”.</value>
+    <comment>0 is BindableProperty name, 1 is the declaring type</comment>
+  </data>
+  <data name="BPName" xml:space="preserve">
+    <value>Nazwa właściwości BindableProperty {0} nie kończy się ciągiem „Property”.</value>
+    <comment>0 is BindableProperty name</comment>
+  </data>
+  <data name="ConstructorDefaultMissing" xml:space="preserve">
+    <value>Brak domyślnego konstruktora dla typu „{0}”.</value>
+    <comment>0 is type name</comment>
+  </data>
+  <data name="ConstructorXArgsMissing" xml:space="preserve">
+    <value>Brak konstruktora dla typu „{0}” z pasującym atrybutem x:Arguments.</value>
+    <comment>0 is type name</comment>
+  </data>
+  <data name="ContentPropertyAttributeMissing" xml:space="preserve">
+    <value>Nie można ustawić zawartości typu „{0}”, ponieważ nie ma on atrybutu [ContentProperty].</value>
+    <comment>0 is type name</comment>
+  </data>
+  <data name="Conversion" xml:space="preserve">
+    <value>Nie można przekonwertować wartości „{0}” na typ „{1}”.</value>
+    <comment>0 is a value, 1 is a type</comment>
+  </data>
+  <data name="EnumValueMissing" xml:space="preserve">
+    <value>Nie znaleziono wartości wyliczenia dla wartości „{0}”.</value>
+    <comment>0 is enum value</comment>
+  </data>
+  <data name="InvalidXaml" xml:space="preserve">
+    <value>Nieprawidłowy kod XAML „{0}”</value>
+    <comment>0 is the invalid xaml snippet</comment>
+  </data>
+  <data name="MarkupNotClosed" xml:space="preserve">
+    <value>Wyrażenie znaczników nie zostało zamknięte.</value>
+  </data>
+  <data name="MarkupParsingFailed" xml:space="preserve">
+    <value>Błąd podczas analizowania wyrażenia znaczników.</value>
+  </data>
+  <data name="MemberResolution" xml:space="preserve">
+    <value>Nie znaleziono właściwości BindableProperty lub zdarzenia dla elementu członkowskiego „{0}” lub wartość i właściwość nie są zgodne.</value>
+    <comment>0 is member name</comment>
+  </data>
+  <data name="MethodStaticMissing" xml:space="preserve">
+    <value>Nie znaleziono żadnej metody statycznej dla elementu „{0}::{1} ({2})”.</value>
+    <comment>0 is type name, 1 is methodname, 2 is type arg list</comment>
+  </data>
+  <data name="MissingEventHandler" xml:space="preserve">
+    <value>W typie „{1}” nie znaleziono programu obsługi zdarzeń „{0}” z poprawnym podpisem.</value>
+    <comment>0 is the handler name, 1 is the declaring type</comment>
+  </data>
+  <data name="NamescopeDuplicate" xml:space="preserve">
+    <value>Element o nazwie „{0}” już istnieje w tym zakresie NameScope.</value>
+    <comment>0 is the duplicated key</comment>
+  </data>
+  <data name="PropertyMissing" xml:space="preserve">
+    <value>Brak obowiązkowej właściwości „{0}” w typie „{1}”.</value>
+    <comment>0 is a property name, 1 is a type</comment>
+  </data>
+  <data name="PropertyResolution" xml:space="preserve">
+    <value>Nie można rozpoznać właściwości „{0}” w typie „{1} (brak właściwości lub brak metod dostępu)”.</value>
+    <comment>0 is a property name, 1 is a type name</comment>
+  </data>
+  <data name="ResourceDictDuplicateKey" xml:space="preserve">
+    <value>„Zasób z kluczem „{0}” już znajduje się w elemencie ResourceDictionary.</value>
+    <comment>0 is key name</comment>
+  </data>
+  <data name="ResourceDictMissingKey" xml:space="preserve">
+    <value>Zasoby w elemencie ResourceDictionary wymagają atrybutu x:Key.</value>
+  </data>
+  <data name="ResourceMissing" xml:space="preserve">
+    <value>Nie znaleziono zasobu „{0}”.</value>
+    <comment>0 is a resourceId</comment>
+  </data>
+  <data name="SByteEnums" xml:space="preserve">
+    <value>Wyliczenia z wieloma wartościami nie są prawidłowe dla typów wyliczeń sbyte.</value>
+  </data>
+  <data name="StyleSheetNoSourceOrContent" xml:space="preserve">
+    <value>Arkusz stylów wymaga źródła albo zawartości.</value>
+  </data>
+  <data name="StyleSheetSourceNotALiteral" xml:space="preserve">
+    <value>Właściwość źródłowa nie jest literałem ciągu.</value>
+  </data>
+  <data name="StyleSheetSourceOrContent" xml:space="preserve">
+    <value>Arkusz stylów nie może mieć zarówno źródła, jak i zawartości.</value>
+  </data>
+  <data name="StyleSheetStyleNotALiteral" xml:space="preserve">
+    <value>Zawartość lub właściwość stylu nie jest literałem ciągu.</value>
+  </data>
+  <data name="TypeResolution" xml:space="preserve">
+    <value>Nie można rozpoznać typu „{0}”.</value>
+    <comment>0 is a type name</comment>
+  </data>
+  <data name="XDataTypeSyntax" xml:space="preserve">
+    <value>Argument x:DataType oczekuje literału ciągu, znacznika {{x:Type}} lub {{x:Nul}l}.</value>
+  </data>
+  <data name="XmlnsUndeclared" xml:space="preserve">
+    <value>Niezadeklarowany prefiks xmlns „{0}”.</value>
+    <comment>0 is the xmlns prefix</comment>
+  </data>
+  <data name="XStaticResolution" xml:space="preserve">
+    <value>x:Static: nie można odnaleźć publicznego — lub dostępnego wewnętrznie — pola statycznego, właściwości statycznej, stałej lub wartości wyliczenia o nazwie „{0}” w typie „{1}”.</value>
+    <comment>0 is membername, 1 is type name</comment>
+  </data>
+  <data name="XStaticSyntax" xml:space="preserve">
+    <value>Składnia elementu x:Static to „[elementCzłonkowski=][prefiks:]nazwaTypu.nazwaStatycznegoElementuCzłonkowskiego”.</value>
+  </data>
+  <data name="XKeyNotLiteral" xml:space="preserve">
+    <value>x: Klawisz oczekuje dosłownego ciągu.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Controls/src/Build.Tasks/xlf/ErrorMessages.pt-BR.resx b/src/Controls/src/Build.Tasks/xlf/ErrorMessages.pt-BR.resx
new file mode 100644
index 000000000000..c27097e3c9f9
--- /dev/null
+++ b/src/Controls/src/Build.Tasks/xlf/ErrorMessages.pt-BR.resx
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="AdderMissing" xml:space="preserve">
+    <value>Não foi definido nenhum método Add() em "{0}{1}".</value>
+    <comment>0 is type name, 1 is property name</comment>
+  </data>
+  <data name="BindingIndexerEmpty" xml:space="preserve">
+    <value>Associação: o indexador não continha nenhum argumento.</value>
+  </data>
+  <data name="BindingIndexerNotClosed" xml:space="preserve">
+    <value>Associação: o indexador não continha nenhum colchete de fechamento.</value>
+  </data>
+  <data name="BindingIndexerParse" xml:space="preserve">
+    <value>Associação: não é possível analisar "{0}" como um índice de uma "{1}".</value>
+    <comment>0 is indexer value, 1 is property name</comment>
+  </data>
+  <data name="BindingIndexerTypeUnsupported" xml:space="preserve">
+    <value>Associação: tipo de índice do indexador sem suporte: "{0}".</value>
+    <comment>0 is indexer type name</comment>
+  </data>
+  <data name="BindingPropertyNotFound" xml:space="preserve">
+    <value>Associação: a propriedade "{0}" não foi encontrada em "{1}".</value>
+    <comment>0 is property name, 1 is type name</comment>
+  </data>
+  <data name="BPMissingGetter" xml:space="preserve">
+    <value>Um método "public static Get{0}" ou um getter de propriedade de instância pública está ausente da propriedade anexada "{1}.{0}Property".</value>
+    <comment>0 is BindableProperty name, 1 is the declaring type</comment>
+  </data>
+  <data name="BPName" xml:space="preserve">
+    <value>O nome da BindableProperty {0} não termina com "Property".</value>
+    <comment>0 is BindableProperty name</comment>
+  </data>
+  <data name="ConstructorDefaultMissing" xml:space="preserve">
+    <value>Construtor padrão ausente de "{0}".</value>
+    <comment>0 is type name</comment>
+  </data>
+  <data name="ConstructorXArgsMissing" xml:space="preserve">
+    <value>Construtor ausente de "{0}" com x:Arguments correspondentes.</value>
+    <comment>0 is type name</comment>
+  </data>
+  <data name="ContentPropertyAttributeMissing" xml:space="preserve">
+    <value>Não é possível definir o conteúdo de "{0}" porque ele não tem um atributo [ContentProperty].</value>
+    <comment>0 is type name</comment>
+  </data>
+  <data name="Conversion" xml:space="preserve">
+    <value>Não é possível converter o valor "{0}" em "{1}".</value>
+    <comment>0 is a value, 1 is a type</comment>
+  </data>
+  <data name="EnumValueMissing" xml:space="preserve">
+    <value>Valor de enumeração não encontrado para "{0}".</value>
+    <comment>0 is enum value</comment>
+  </data>
+  <data name="InvalidXaml" xml:space="preserve">
+    <value>XAML inválido "{0}".</value>
+    <comment>0 is the invalid xaml snippet</comment>
+  </data>
+  <data name="MarkupNotClosed" xml:space="preserve">
+    <value>Expressão de marcação não fechada.</value>
+  </data>
+  <data name="MarkupParsingFailed" xml:space="preserve">
+    <value>Erro ao analisar a expressão de marcação.</value>
+  </data>
+  <data name="MemberResolution" xml:space="preserve">
+    <value>Não foi encontrada nenhuma propriedade, nenhuma BindableProperty nem nenhum evento para "{0}". Ou o valor e a propriedade apresentam tipos incompatíveis.</value>
+    <comment>0 is member name</comment>
+  </data>
+  <data name="MethodStaticMissing" xml:space="preserve">
+    <value>Não foi encontrado nenhum método estático para "{0}::{1} ({2})".</value>
+    <comment>0 is type name, 1 is methodname, 2 is type arg list</comment>
+  </data>
+  <data name="MissingEventHandler" xml:space="preserve">
+    <value>O EventHandler "{0}" com a assinatura correta não foi encontrado no tipo "{1}".</value>
+    <comment>0 is the handler name, 1 is the declaring type</comment>
+  </data>
+  <data name="NamescopeDuplicate" xml:space="preserve">
+    <value>Já existe um elemento com o nome "{0}" neste NameScope.</value>
+    <comment>0 is the duplicated key</comment>
+  </data>
+  <data name="PropertyMissing" xml:space="preserve">
+    <value>Propriedade obrigatória "{0}" ausente de "{1}".</value>
+    <comment>0 is a property name, 1 is a type</comment>
+  </data>
+  <data name="PropertyResolution" xml:space="preserve">
+    <value>Não é possível resolver a propriedade "{0}" no tipo "{1} (propriedade ou acessadores ausentes)".</value>
+    <comment>0 is a property name, 1 is a type name</comment>
+  </data>
+  <data name="ResourceDictDuplicateKey" xml:space="preserve">
+    <value>"Um recurso com a chave "{0}" já está presente no ResourceDictionary.</value>
+    <comment>0 is key name</comment>
+  </data>
+  <data name="ResourceDictMissingKey" xml:space="preserve">
+    <value>Os recursos no ResourceDictionary exigem um atributo x:Key.</value>
+  </data>
+  <data name="ResourceMissing" xml:space="preserve">
+    <value>O recurso "{0}" não foi encontrado.</value>
+    <comment>0 is a resourceId</comment>
+  </data>
+  <data name="SByteEnums" xml:space="preserve">
+    <value>Enumerações com valores múltiplos não são válidas em tipos enumerados sbyte.</value>
+  </data>
+  <data name="StyleSheetNoSourceOrContent" xml:space="preserve">
+    <value>A StyleSheet exige uma Origem ou um conteúdo.</value>
+  </data>
+  <data name="StyleSheetSourceNotALiteral" xml:space="preserve">
+    <value>A propriedade de origem não é um literal de cadeia de caracteres.</value>
+  </data>
+  <data name="StyleSheetSourceOrContent" xml:space="preserve">
+    <value>A StyleSheet não pode ter uma Origem e também um conteúdo.</value>
+  </data>
+  <data name="StyleSheetStyleNotALiteral" xml:space="preserve">
+    <value>A propriedade ou o Conteúdo de Estilo não é um literal de cadeia de caracteres.</value>
+  </data>
+  <data name="TypeResolution" xml:space="preserve">
+    <value>Não é possível resolver o tipo "{0}".</value>
+    <comment>0 is a type name</comment>
+  </data>
+  <data name="XDataTypeSyntax" xml:space="preserve">
+    <value>O x:DataType espera um literal de cadeia de caracteres, uma marcação {{x:Type}} ou um {{x:Nul}l}.</value>
+  </data>
+  <data name="XmlnsUndeclared" xml:space="preserve">
+    <value>Prefixo xmlns não declarado "{0}".</value>
+    <comment>0 is the xmlns prefix</comment>
+  </data>
+  <data name="XStaticResolution" xml:space="preserve">
+    <value>O x:Static: não pôde encontrar um campo estático, uma propriedade estática, um valor const ou enumerado público (ou interno acessível) denominado "{0}" em "{1}".</value>
+    <comment>0 is membername, 1 is type name</comment>
+  </data>
+  <data name="XStaticSyntax" xml:space="preserve">
+    <value>A sintaxe de x:Static é "[Member=][prefix:]typeName.staticMemberName".</value>
+  </data>
+  <data name="XKeyNotLiteral" xml:space="preserve">
+    <value>x:Key espera uma cadeia de caracteres literal.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Controls/src/Build.Tasks/xlf/ErrorMessages.ru.resx b/src/Controls/src/Build.Tasks/xlf/ErrorMessages.ru.resx
new file mode 100644
index 000000000000..5f57347ec0ab
--- /dev/null
+++ b/src/Controls/src/Build.Tasks/xlf/ErrorMessages.ru.resx
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="AdderMissing" xml:space="preserve">
+    <value>Для "{0}{1}" не определен метод Add ().</value>
+    <comment>0 is type name, 1 is property name</comment>
+  </data>
+  <data name="BindingIndexerEmpty" xml:space="preserve">
+    <value>Привязка: индексатор не содержит аргументов.</value>
+  </data>
+  <data name="BindingIndexerNotClosed" xml:space="preserve">
+    <value>Привязка: индексатор не содержит закрывающей скобки.</value>
+  </data>
+  <data name="BindingIndexerParse" xml:space="preserve">
+    <value>Привязка: не удается проанализировать значение индексатора "{0}" как индекс для свойства "{1}".</value>
+    <comment>0 is indexer value, 1 is property name</comment>
+  </data>
+  <data name="BindingIndexerTypeUnsupported" xml:space="preserve">
+    <value>Привязка: неподдерживаемый тип индекса индексатора: "{0}".</value>
+    <comment>0 is indexer type name</comment>
+  </data>
+  <data name="BindingPropertyNotFound" xml:space="preserve">
+    <value>Привязка: свойство "{0}" не найдено в "{1}".</value>
+    <comment>0 is property name, 1 is type name</comment>
+  </data>
+  <data name="BPMissingGetter" xml:space="preserve">
+    <value>Отсутствует метод "public static Get{0}" или метод получения открытого свойства экземпляра для вложенного свойства "{1}.{0}Property".</value>
+    <comment>0 is BindableProperty name, 1 is the declaring type</comment>
+  </data>
+  <data name="BPName" xml:space="preserve">
+    <value>Имя привязываемого свойства (BindableProperty) {0} не заканчивается на "Property".</value>
+    <comment>0 is BindableProperty name</comment>
+  </data>
+  <data name="ConstructorDefaultMissing" xml:space="preserve">
+    <value>Отсутствует конструктор по умолчанию для "{0}".</value>
+    <comment>0 is type name</comment>
+  </data>
+  <data name="ConstructorXArgsMissing" xml:space="preserve">
+    <value>Отсутствует конструктор для "{0}" с соответствующим x:Arguments.</value>
+    <comment>0 is type name</comment>
+  </data>
+  <data name="ContentPropertyAttributeMissing" xml:space="preserve">
+    <value>Не удается задать содержимое "{0}", так как у него нет атрибута [ContentProperty].</value>
+    <comment>0 is type name</comment>
+  </data>
+  <data name="Conversion" xml:space="preserve">
+    <value>Не удается преобразовать значение "{0}" в "{1}".</value>
+    <comment>0 is a value, 1 is a type</comment>
+  </data>
+  <data name="EnumValueMissing" xml:space="preserve">
+    <value>Значение перечисления для "{0}" не найдено.</value>
+    <comment>0 is enum value</comment>
+  </data>
+  <data name="InvalidXaml" xml:space="preserve">
+    <value>Недопустимый код XAML "{0}".</value>
+    <comment>0 is the invalid xaml snippet</comment>
+  </data>
+  <data name="MarkupNotClosed" xml:space="preserve">
+    <value>Выражение разметки не закрыто.</value>
+  </data>
+  <data name="MarkupParsingFailed" xml:space="preserve">
+    <value>Ошибка при анализе выражения разметки.</value>
+  </data>
+  <data name="MemberResolution" xml:space="preserve">
+    <value>Не найдено свойство, привязываемое свойство (BindableProperty) или событие для "{0}" либо типы значения и свойства не совпадают.</value>
+    <comment>0 is member name</comment>
+  </data>
+  <data name="MethodStaticMissing" xml:space="preserve">
+    <value>Не найден статический метод для "{0}::{1} ({2})".</value>
+    <comment>0 is type name, 1 is methodname, 2 is type arg list</comment>
+  </data>
+  <data name="MissingEventHandler" xml:space="preserve">
+    <value>В типе "{1}" не найден обработчик событий (EventHandler) "{0}" с правильной подписью.</value>
+    <comment>0 is the handler name, 1 is the declaring type</comment>
+  </data>
+  <data name="NamescopeDuplicate" xml:space="preserve">
+    <value>Элемент с именем "{0}" уже существует в этой области видимости имен.</value>
+    <comment>0 is the duplicated key</comment>
+  </data>
+  <data name="PropertyMissing" xml:space="preserve">
+    <value>Отсутствует обязательное свойство "{0}" для "{1}".</value>
+    <comment>0 is a property name, 1 is a type</comment>
+  </data>
+  <data name="PropertyResolution" xml:space="preserve">
+    <value>Не удается разрешить свойство "{0}" для типа "{1} (свойство отсутствует или не содержит методов доступа)".</value>
+    <comment>0 is a property name, 1 is a type name</comment>
+  </data>
+  <data name="ResourceDictDuplicateKey" xml:space="preserve">
+    <value>"Ресурс с ключом "{0}" уже присутствует в ResourceDictionary.</value>
+    <comment>0 is key name</comment>
+  </data>
+  <data name="ResourceDictMissingKey" xml:space="preserve">
+    <value>Для ресурсов в ResourceDictionary требуется атрибут x:Key.</value>
+  </data>
+  <data name="ResourceMissing" xml:space="preserve">
+    <value>Ресурс "{0}" не найден.</value>
+    <comment>0 is a resourceId</comment>
+  </data>
+  <data name="SByteEnums" xml:space="preserve">
+    <value>Перечисления с несколькими значениями не могут использоваться в типах перечисления sbyte.</value>
+  </data>
+  <data name="StyleSheetNoSourceOrContent" xml:space="preserve">
+    <value>Для таблицы стилей (StyleSheet) необходимо указать источник (Source) или содержимое.</value>
+  </data>
+  <data name="StyleSheetSourceNotALiteral" xml:space="preserve">
+    <value>Свойство Source не является строковым литералом.</value>
+  </data>
+  <data name="StyleSheetSourceOrContent" xml:space="preserve">
+    <value>Таблица стилей (StyleSheet) не может одновременно содержать источник (Source) и содержимое.</value>
+  </data>
+  <data name="StyleSheetStyleNotALiteral" xml:space="preserve">
+    <value>Свойство Style или содержимое (Content) не является строковым литералом.</value>
+  </data>
+  <data name="TypeResolution" xml:space="preserve">
+    <value>Не удается разрешить тип "{0}".</value>
+    <comment>0 is a type name</comment>
+  </data>
+  <data name="XDataTypeSyntax" xml:space="preserve">
+    <value>x:DataType ожидает строковый литерал, разметку {{x:Type}} или {{x:Nul}l}.</value>
+  </data>
+  <data name="XmlnsUndeclared" xml:space="preserve">
+    <value>Необъявленный префикс xmlns "{0}".</value>
+    <comment>0 is the xmlns prefix</comment>
+  </data>
+  <data name="XStaticResolution" xml:space="preserve">
+    <value>x:Static: не удается найти статическое поле, статическое свойство, константу или значение перечисления с именем "{0}" в "{1}", которые являлись бы открытыми или были бы доступны внутренне.</value>
+    <comment>0 is membername, 1 is type name</comment>
+  </data>
+  <data name="XStaticSyntax" xml:space="preserve">
+    <value>Синтаксис для x:Static — "[Member=][prefix:]typeName.staticMemberName".</value>
+  </data>
+  <data name="XKeyNotLiteral" xml:space="preserve">
+    <value>x:Key ожидает строковый литерал.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Controls/src/Build.Tasks/xlf/ErrorMessages.tr.resx b/src/Controls/src/Build.Tasks/xlf/ErrorMessages.tr.resx
new file mode 100644
index 000000000000..0847f628082c
--- /dev/null
+++ b/src/Controls/src/Build.Tasks/xlf/ErrorMessages.tr.resx
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="AdderMissing" xml:space="preserve">
+    <value>"{0}{1}" üzerinde Add() metodu tanımlanmadı.</value>
+    <comment>0 is type name, 1 is property name</comment>
+  </data>
+  <data name="BindingIndexerEmpty" xml:space="preserve">
+    <value>Bağlama: Dizin oluşturucu bağımsız değişken içermiyordu.</value>
+  </data>
+  <data name="BindingIndexerNotClosed" xml:space="preserve">
+    <value>Bağlama: Dizin oluşturucu kapatma köşeli ayracı içermiyordu.</value>
+  </data>
+  <data name="BindingIndexerParse" xml:space="preserve">
+    <value>Bağlama: "{0}", "{1}" için dizin olarak ayrıştırılamıyor.</value>
+    <comment>0 is indexer value, 1 is property name</comment>
+  </data>
+  <data name="BindingIndexerTypeUnsupported" xml:space="preserve">
+    <value>Bağlama: "{0}" dizin oluşturucu dizin türü desteklenmiyor.</value>
+    <comment>0 is indexer type name</comment>
+  </data>
+  <data name="BindingPropertyNotFound" xml:space="preserve">
+    <value>Bağlama: "{1}" üzerinde "{0}" özelliği bulunamadı.</value>
+    <comment>0 is property name, 1 is type name</comment>
+  </data>
+  <data name="BPMissingGetter" xml:space="preserve">
+    <value>"{1}.{0}Property" iliştirilmiş özelliği için "public static Get{0}" metodu veya genel örnek özellik alıcısı eksik.</value>
+    <comment>0 is BindableProperty name, 1 is the declaring type</comment>
+  </data>
+  <data name="BPName" xml:space="preserve">
+    <value>{0} BindableProperty adı "Property" ile bitmiyor.</value>
+    <comment>0 is BindableProperty name</comment>
+  </data>
+  <data name="ConstructorDefaultMissing" xml:space="preserve">
+    <value>"{0}" için varsayılan oluşturucu eksik.</value>
+    <comment>0 is type name</comment>
+  </data>
+  <data name="ConstructorXArgsMissing" xml:space="preserve">
+    <value>"{0}" için x:Arguments ile eşleşen oluşturucu eksik.</value>
+    <comment>0 is type name</comment>
+  </data>
+  <data name="ContentPropertyAttributeMissing" xml:space="preserve">
+    <value>"{0}" içeriği, [ContentProperty] özniteliğine sahip olmadığından ayarlanamıyor.</value>
+    <comment>0 is type name</comment>
+  </data>
+  <data name="Conversion" xml:space="preserve">
+    <value>"{0}" değeri "{1}" türüne dönüştürülemiyor.</value>
+    <comment>0 is a value, 1 is a type</comment>
+  </data>
+  <data name="EnumValueMissing" xml:space="preserve">
+    <value>"{0}" için sabit listesi değeri bulunamadı.</value>
+    <comment>0 is enum value</comment>
+  </data>
+  <data name="InvalidXaml" xml:space="preserve">
+    <value>Geçersiz Xaml "{0}".</value>
+    <comment>0 is the invalid xaml snippet</comment>
+  </data>
+  <data name="MarkupNotClosed" xml:space="preserve">
+    <value>İşaretleme ifadesi kapatılamadı.</value>
+  </data>
+  <data name="MarkupParsingFailed" xml:space="preserve">
+    <value>İşaretleme ifadesi ayrıştırılırken hata oluştu.</value>
+  </data>
+  <data name="MemberResolution" xml:space="preserve">
+    <value>"{0}" için özellik, BindableProperty veya olay bulunamadı ya da değer ile özellik arasındaki tür eşleşmiyor.</value>
+    <comment>0 is member name</comment>
+  </data>
+  <data name="MethodStaticMissing" xml:space="preserve">
+    <value>"{0}::{1} ({2})" için statik metot bulunamadı.</value>
+    <comment>0 is type name, 1 is methodname, 2 is type arg list</comment>
+  </data>
+  <data name="MissingEventHandler" xml:space="preserve">
+    <value>"{1}" türünde doğru imzaya sahip "{0}" EventHandler bulunamadı.</value>
+    <comment>0 is the handler name, 1 is the declaring type</comment>
+  </data>
+  <data name="NamescopeDuplicate" xml:space="preserve">
+    <value>Bu NameScope içinde "{0}" adlı bir öğe zaten var.</value>
+    <comment>0 is the duplicated key</comment>
+  </data>
+  <data name="PropertyMissing" xml:space="preserve">
+    <value>"{1}" türünde zorunlu "{0}" özelliği eksik.</value>
+    <comment>0 is a property name, 1 is a type</comment>
+  </data>
+  <data name="PropertyResolution" xml:space="preserve">
+    <value>"{1} türündeki "{0}" özelliği çözümlenemiyor (özellik veya erişimciler eksik)".</value>
+    <comment>0 is a property name, 1 is a type name</comment>
+  </data>
+  <data name="ResourceDictDuplicateKey" xml:space="preserve">
+    <value>"ResourceDictionary içinde "{0}" anahtarına sahip bir kaynak zaten var.</value>
+    <comment>0 is key name</comment>
+  </data>
+  <data name="ResourceDictMissingKey" xml:space="preserve">
+    <value>ResourceDictionary içindeki kaynaklar için x:Key özniteliği gerekir.</value>
+  </data>
+  <data name="ResourceMissing" xml:space="preserve">
+    <value>"{0}" kaynağı bulunamadı.</value>
+    <comment>0 is a resourceId</comment>
+  </data>
+  <data name="SByteEnums" xml:space="preserve">
+    <value>Birden çok değere sahip sabit listeleri, sbyte sabit listesi türlerinde geçerli değil.</value>
+  </data>
+  <data name="StyleSheetNoSourceOrContent" xml:space="preserve">
+    <value>StyleSheet için Source veya içerik gerekir.</value>
+  </data>
+  <data name="StyleSheetSourceNotALiteral" xml:space="preserve">
+    <value>Kaynak özelliği bir dize sabit değeri değil.</value>
+  </data>
+  <data name="StyleSheetSourceOrContent" xml:space="preserve">
+    <value>StyleSheet, hem Source hem de içerik bulunduramaz.</value>
+  </data>
+  <data name="StyleSheetStyleNotALiteral" xml:space="preserve">
+    <value>Style özelliği veya Content bir dize sabit değeri değil.</value>
+  </data>
+  <data name="TypeResolution" xml:space="preserve">
+    <value>"{0}" türü çözümlenemiyor.</value>
+    <comment>0 is a type name</comment>
+  </data>
+  <data name="XDataTypeSyntax" xml:space="preserve">
+    <value>x:DataType için bir dize sabit değeri, {{x:Type}} işaretlemesi veya {{x:Nul}l} bekleniyor.</value>
+  </data>
+  <data name="XmlnsUndeclared" xml:space="preserve">
+    <value>"{0}" xmlns ön eki bildirilmedi.</value>
+    <comment>0 is the xmlns prefix</comment>
+  </data>
+  <data name="XStaticResolution" xml:space="preserve">
+    <value>x:Static: "{1}" içinde "{0}" adlı genel -- veya erişilebilir, dahili -- statik alan, statik özellik, sabit veya sabit listesi değeri bulunamıyor.</value>
+    <comment>0 is membername, 1 is type name</comment>
+  </data>
+  <data name="XStaticSyntax" xml:space="preserve">
+    <value>x:Static için söz dizimi "[Member=][önek:]türAdı.statikÜyeAdı" şeklindedir.</value>
+  </data>
+  <data name="XKeyNotLiteral" xml:space="preserve">
+    <value>x:Key bir sabit değerli dize bekliyor.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Controls/src/Build.Tasks/xlf/ErrorMessages.zh-Hans.resx b/src/Controls/src/Build.Tasks/xlf/ErrorMessages.zh-Hans.resx
new file mode 100644
index 000000000000..b4cf88160d17
--- /dev/null
+++ b/src/Controls/src/Build.Tasks/xlf/ErrorMessages.zh-Hans.resx
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="AdderMissing" xml:space="preserve">
+    <value>未在“{0}{1}”上定义 Add() 方法。</value>
+    <comment>0 is type name, 1 is property name</comment>
+  </data>
+  <data name="BindingIndexerEmpty" xml:space="preserve">
+    <value>绑定: 索引器未包含参数。</value>
+  </data>
+  <data name="BindingIndexerNotClosed" xml:space="preserve">
+    <value>绑定: 索引器未包含右方括号。</value>
+  </data>
+  <data name="BindingIndexerParse" xml:space="preserve">
+    <value>绑定: 无法将“{0}”作为“{1}”的索引进行分析。</value>
+    <comment>0 is indexer value, 1 is property name</comment>
+  </data>
+  <data name="BindingIndexerTypeUnsupported" xml:space="preserve">
+    <value>绑定: 不受支持的索引器索引类型:“{0}”。</value>
+    <comment>0 is indexer type name</comment>
+  </data>
+  <data name="BindingPropertyNotFound" xml:space="preserve">
+    <value>绑定: 在“{1}”上找不到属性“{0}”。</value>
+    <comment>0 is property name, 1 is type name</comment>
+  </data>
+  <data name="BPMissingGetter" xml:space="preserve">
+    <value>对于附加属性 "{1}.{0}Property"，缺少 "public static Get{0}" 方法或公共实例属性 getter。</value>
+    <comment>0 is BindableProperty name, 1 is the declaring type</comment>
+  </data>
+  <data name="BPName" xml:space="preserve">
+    <value>BindableProperty {0} 的名称不是以 "Property" 结尾的。</value>
+    <comment>0 is BindableProperty name</comment>
+  </data>
+  <data name="ConstructorDefaultMissing" xml:space="preserve">
+    <value>缺少“{0}”的默认构造函数。</value>
+    <comment>0 is type name</comment>
+  </data>
+  <data name="ConstructorXArgsMissing" xml:space="preserve">
+    <value>“{0}”中缺少具有匹配的 x:Arguments 的构造函数。</value>
+    <comment>0 is type name</comment>
+  </data>
+  <data name="ContentPropertyAttributeMissing" xml:space="preserve">
+    <value>无法设置“{0}”的内容，因为它没有 [ContentProperty] 属性。</value>
+    <comment>0 is type name</comment>
+  </data>
+  <data name="Conversion" xml:space="preserve">
+    <value>无法将值“{0}”转换为“{1}”。</value>
+    <comment>0 is a value, 1 is a type</comment>
+  </data>
+  <data name="EnumValueMissing" xml:space="preserve">
+    <value>找不到“{0}”的枚举值。</value>
+    <comment>0 is enum value</comment>
+  </data>
+  <data name="InvalidXaml" xml:space="preserve">
+    <value>Xaml“{0}”无效。</value>
+    <comment>0 is the invalid xaml snippet</comment>
+  </data>
+  <data name="MarkupNotClosed" xml:space="preserve">
+    <value>标记表达式未关闭。</value>
+  </data>
+  <data name="MarkupParsingFailed" xml:space="preserve">
+    <value>分析标记表达式时出错。</value>
+  </data>
+  <data name="MemberResolution" xml:space="preserve">
+    <value>未找到“{0}”的属性、BindableProperty 或事件，或者值与属性之间的类型不匹配。</value>
+    <comment>0 is member name</comment>
+  </data>
+  <data name="MethodStaticMissing" xml:space="preserve">
+    <value>找不到“{0}::{1} ({2})”的静态方法。</value>
+    <comment>0 is type name, 1 is methodname, 2 is type arg list</comment>
+  </data>
+  <data name="MissingEventHandler" xml:space="preserve">
+    <value>在类型“{1}”中找不到具有正确签名的 EventHandler“{0}”。</value>
+    <comment>0 is the handler name, 1 is the declaring type</comment>
+  </data>
+  <data name="NamescopeDuplicate" xml:space="preserve">
+    <value>此 NameScope 中已存在名为“{0}”的元素。</value>
+    <comment>0 is the duplicated key</comment>
+  </data>
+  <data name="PropertyMissing" xml:space="preserve">
+    <value>“{1}”上缺少强制属性“{0}”。</value>
+    <comment>0 is a property name, 1 is a type</comment>
+  </data>
+  <data name="PropertyResolution" xml:space="preserve">
+    <value>无法解析类型“{1}”上的属性“{0}”(缺少属性或访问器)”。</value>
+    <comment>0 is a property name, 1 is a type name</comment>
+  </data>
+  <data name="ResourceDictDuplicateKey" xml:space="preserve">
+    <value>ResourceDictionary 中已存在具有键“{0}”的资源。</value>
+    <comment>0 is key name</comment>
+  </data>
+  <data name="ResourceDictMissingKey" xml:space="preserve">
+    <value>ResourceDictionary 中的资源需具有 x:Key 属性。</value>
+  </data>
+  <data name="ResourceMissing" xml:space="preserve">
+    <value>找不到资源“{0}”。</value>
+    <comment>0 is a resourceId</comment>
+  </data>
+  <data name="SByteEnums" xml:space="preserve">
+    <value>多值枚举在 sbyte 枚举类型上无效。</value>
+  </data>
+  <data name="StyleSheetNoSourceOrContent" xml:space="preserve">
+    <value>样式表需要源或内容。</value>
+  </data>
+  <data name="StyleSheetSourceNotALiteral" xml:space="preserve">
+    <value>源属性不是字符串文本。</value>
+  </data>
+  <data name="StyleSheetSourceOrContent" xml:space="preserve">
+    <value>样式表不能同时具有源和内容。</value>
+  </data>
+  <data name="StyleSheetStyleNotALiteral" xml:space="preserve">
+    <value>样式属性或内容不是字符串文本。</value>
+  </data>
+  <data name="TypeResolution" xml:space="preserve">
+    <value>无法解析类型“{0}”。</value>
+    <comment>0 is a type name</comment>
+  </data>
+  <data name="XDataTypeSyntax" xml:space="preserve">
+    <value>x:DataType 需要字符串文本、{{x:Type}} 标记或 {{x:Nul}l}。</value>
+  </data>
+  <data name="XmlnsUndeclared" xml:space="preserve">
+    <value>xmlns 前缀“{0}”未经过声明。</value>
+    <comment>0 is the xmlns prefix</comment>
+  </data>
+  <data name="XStaticResolution" xml:space="preserve">
+    <value>x:Static: 在“{1}”中找不到公共(或可访问的内部)静态字段、静态属性、常量或枚举值“{0}”。</value>
+    <comment>0 is membername, 1 is type name</comment>
+  </data>
+  <data name="XStaticSyntax" xml:space="preserve">
+    <value>x:Static 的语法为 "[Member=][prefix:]typeName.staticMemberName"。</value>
+  </data>
+  <data name="XKeyNotLiteral" xml:space="preserve">
+    <value>x:Key 需要字符串字面量。</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Controls/src/Build.Tasks/xlf/ErrorMessages.zh-Hant.resx b/src/Controls/src/Build.Tasks/xlf/ErrorMessages.zh-Hant.resx
new file mode 100644
index 000000000000..5eb7d3939e92
--- /dev/null
+++ b/src/Controls/src/Build.Tasks/xlf/ErrorMessages.zh-Hant.resx
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="AdderMissing" xml:space="preserve">
+    <value>在 "{0}{1}" 上未定義任何 Add() 方法。</value>
+    <comment>0 is type name, 1 is property name</comment>
+  </data>
+  <data name="BindingIndexerEmpty" xml:space="preserve">
+    <value>繫結: 索引子未包含引數。</value>
+  </data>
+  <data name="BindingIndexerNotClosed" xml:space="preserve">
+    <value>繫結: 索引子未包含右中括弧。</value>
+  </data>
+  <data name="BindingIndexerParse" xml:space="preserve">
+    <value>繫結: "{0}" 無法剖析為 "{1}" 的索引。</value>
+    <comment>0 is indexer value, 1 is property name</comment>
+  </data>
+  <data name="BindingIndexerTypeUnsupported" xml:space="preserve">
+    <value>繫結: 不支援的索引子索引類型: "{0}"。</value>
+    <comment>0 is indexer type name</comment>
+  </data>
+  <data name="BindingPropertyNotFound" xml:space="preserve">
+    <value>繫結: 在 "{1}" 上找不到屬性 "{0}"。</value>
+    <comment>0 is property name, 1 is type name</comment>
+  </data>
+  <data name="BPMissingGetter" xml:space="preserve">
+    <value>缺少附加屬性 "{1}.{0}Property" 的 "public static Get{0}" 方法或公用執行個體屬性 getter。</value>
+    <comment>0 is BindableProperty name, 1 is the declaring type</comment>
+  </data>
+  <data name="BPName" xml:space="preserve">
+    <value>BindableProperty {0} 的名稱不是以 "Property" 結尾。</value>
+    <comment>0 is BindableProperty name</comment>
+  </data>
+  <data name="ConstructorDefaultMissing" xml:space="preserve">
+    <value>缺少 "{0}" 的預設建構函式。</value>
+    <comment>0 is type name</comment>
+  </data>
+  <data name="ConstructorXArgsMissing" xml:space="preserve">
+    <value>缺少符合 x:Arguments 的 "{0}" 建構函式。</value>
+    <comment>0 is type name</comment>
+  </data>
+  <data name="ContentPropertyAttributeMissing" xml:space="preserve">
+    <value>因為 "{0}" 沒有 [ContentProperty] 屬性，所以無法設定其內容。</value>
+    <comment>0 is type name</comment>
+  </data>
+  <data name="Conversion" xml:space="preserve">
+    <value>無法將值 "{0}" 轉換成 "{1}"。</value>
+    <comment>0 is a value, 1 is a type</comment>
+  </data>
+  <data name="EnumValueMissing" xml:space="preserve">
+    <value>找不到 "{0}" 的列舉值。</value>
+    <comment>0 is enum value</comment>
+  </data>
+  <data name="InvalidXaml" xml:space="preserve">
+    <value>XAML "{0}" 無效。</value>
+    <comment>0 is the invalid xaml snippet</comment>
+  </data>
+  <data name="MarkupNotClosed" xml:space="preserve">
+    <value>標記運算式未結束。</value>
+  </data>
+  <data name="MarkupParsingFailed" xml:space="preserve">
+    <value>剖析標記運算式時發生錯誤。</value>
+  </data>
+  <data name="MemberResolution" xml:space="preserve">
+    <value>找不到 "{0}" 的屬性、BindableProperty 或事件，或值與屬性之間的類型不相符。</value>
+    <comment>0 is member name</comment>
+  </data>
+  <data name="MethodStaticMissing" xml:space="preserve">
+    <value>找不到 "{0}::{1} ({2})" 的任何靜態方法。</value>
+    <comment>0 is type name, 1 is methodname, 2 is type arg list</comment>
+  </data>
+  <data name="MissingEventHandler" xml:space="preserve">
+    <value>在型別 "{1}" 中找不到具有正確特徵標記的 EventHandler "{0}"。</value>
+    <comment>0 is the handler name, 1 is the declaring type</comment>
+  </data>
+  <data name="NamescopeDuplicate" xml:space="preserve">
+    <value>名稱為 "{0}" 的元素已存在於此 NameScope 中。</value>
+    <comment>0 is the duplicated key</comment>
+  </data>
+  <data name="PropertyMissing" xml:space="preserve">
+    <value>在 "{1}" 上缺少強制屬性 "{0}"。</value>
+    <comment>0 is a property name, 1 is a type</comment>
+  </data>
+  <data name="PropertyResolution" xml:space="preserve">
+    <value>無法解析型別 "{1}" 上的屬性 "{0}" (缺少屬性或缺少存取子)。</value>
+    <comment>0 is a property name, 1 is a type name</comment>
+  </data>
+  <data name="ResourceDictDuplicateKey" xml:space="preserve">
+    <value>在 ResourceDictionary 中已有金鑰為 "{0}" 的資源。</value>
+    <comment>0 is key name</comment>
+  </data>
+  <data name="ResourceDictMissingKey" xml:space="preserve">
+    <value>ResourceDictionary 中的資源需要 x:Key 屬性。</value>
+  </data>
+  <data name="ResourceMissing" xml:space="preserve">
+    <value>找不到資源 "{0}"。</value>
+    <comment>0 is a resourceId</comment>
+  </data>
+  <data name="SByteEnums" xml:space="preserve">
+    <value>sbyte 列舉類型上，多重值列舉無效。</value>
+  </data>
+  <data name="StyleSheetNoSourceOrContent" xml:space="preserve">
+    <value>樣式表需要來源或內容。</value>
+  </data>
+  <data name="StyleSheetSourceNotALiteral" xml:space="preserve">
+    <value>來源屬性不是字串常值。</value>
+  </data>
+  <data name="StyleSheetSourceOrContent" xml:space="preserve">
+    <value>樣式表不能同時有來源和內容。</value>
+  </data>
+  <data name="StyleSheetStyleNotALiteral" xml:space="preserve">
+    <value>樣式屬性或內容不是字串常值。</value>
+  </data>
+  <data name="TypeResolution" xml:space="preserve">
+    <value>無法解析型別 "{0}"。</value>
+    <comment>0 is a type name</comment>
+  </data>
+  <data name="XDataTypeSyntax" xml:space="preserve">
+    <value>x:DataType 需要字串常值、{{x:Type}} 標記或 {{x:Nul}l}。</value>
+  </data>
+  <data name="XmlnsUndeclared" xml:space="preserve">
+    <value>未宣告的 xmlns 前置詞 "{0}"。</value>
+    <comment>0 is the xmlns prefix</comment>
+  </data>
+  <data name="XStaticResolution" xml:space="preserve">
+    <value>x:Static: 在 "{1}" 中找不到名為 "{0}" 的公用 (或可存取內部) 靜態欄位、靜態屬性、常數或列舉值。</value>
+    <comment>0 is membername, 1 is type name</comment>
+  </data>
+  <data name="XStaticSyntax" xml:space="preserve">
+    <value>x:Static 的語法為 "[Member=][prefix:]typeName.staticMemberName"。</value>
+  </data>
+  <data name="XKeyNotLiteral" xml:space="preserve">
+    <value>x:金鑰需要字串常值。</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/Controls/src/Core.Design/AttributeTableBuilder.cs b/src/Controls/src/Core.Design/AttributeTableBuilder.cs
index 18530e028b9b..4f1e9a092d4b 100644
--- a/src/Controls/src/Core.Design/AttributeTableBuilder.cs
+++ b/src/Controls/src/Core.Design/AttributeTableBuilder.cs
@@ -1,9 +1,16 @@
 using System;
 using System.ComponentModel;
+using System.Globalization;
 using System.Linq;
+using System.Reflection;
 using System.Windows.Markup;
 using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Controls.Layout2;
+using Microsoft.Maui.Controls.Shapes;
+using Microsoft.Maui.Graphics;
 using Microsoft.Windows.Design;
+using Microsoft.Windows.Design.Metadata;
+using Rectangle = Microsoft.Maui.Graphics.Rectangle;
 
 namespace Microsoft.Maui.Controls.Core.Design
 {
@@ -70,6 +77,231 @@ public AttributeTableBuilder()
 				//new System.Windows.Markup.MarkupExtensionReturnTypeAttribute (),
 			}));
 		}
+
+		private void AddAttributesForTypes()
+		{
+			Type typeFromHandle = typeof(AbsoluteLayout);
+			AddTypeAttributes(typeFromHandle, new ContentPropertyAttribute("Children"));
+			typeFromHandle = typeof(ActivityIndicator);
+			typeFromHandle = typeof(BoxView);
+			typeFromHandle = typeof(Button);
+			typeFromHandle = typeof(CarouselPage);
+			AddTypeAttributes(typeFromHandle, new ContentPropertyAttribute("Children"));
+			typeFromHandle = typeof(CarouselView);
+			typeFromHandle = typeof(CheckBox);
+			typeFromHandle = typeof(CollectionView);
+			typeFromHandle = typeof(Color);
+			AddTypeAttributes(typeFromHandle, new TypeConverterAttribute(typeof(NamedColorsConverter)));
+			AddTypeAttributes(typeFromHandle, new ContentPropertyAttribute("Content"));
+			typeFromHandle = typeof(ConstraintExpression);
+			AddTypeAttributes(typeFromHandle, new MarkupExtensionReturnTypeAttribute());
+			typeFromHandle = typeof(ContentPage);
+			AddTypeAttributes(typeFromHandle, new ContentPropertyAttribute("Content"));
+			typeFromHandle = typeof(ContentPresenter);
+			typeFromHandle = typeof(ContentView);
+			AddTypeAttributes(typeFromHandle, new ContentPropertyAttribute("Content"));
+			typeFromHandle = typeof(DatePicker);
+			typeFromHandle = typeof(Easing);
+			AddTypeAttributes(typeFromHandle, new TypeConverterAttribute(typeof(StructOptionsConverter<Easing>)));
+			typeFromHandle = typeof(Editor);
+			typeFromHandle = typeof(Ellipse);
+			typeFromHandle = typeof(Entry);
+			typeFromHandle = typeof(FlexLayout);
+			AddTypeAttributes(typeFromHandle, new ContentPropertyAttribute("Children"));
+			typeFromHandle = typeof(FlyoutPage);
+			AddTypeAttributes(typeFromHandle, new ContentPropertyAttribute("Detail"));
+			typeFromHandle = typeof(Frame);
+			AddTypeAttributes(typeFromHandle, new ContentPropertyAttribute("Content"));
+			typeFromHandle = typeof(Grid);
+			AddTypeAttributes(typeFromHandle, new ContentPropertyAttribute("Children"));
+
+			typeFromHandle = typeof(GridLayout);
+			AddTypeAttributes(typeFromHandle, new ContentPropertyAttribute("Children"));
+			typeFromHandle = typeof(Layout2.Layout);
+			AddTypeAttributes(typeFromHandle, new ContentPropertyAttribute("Children"));
+			typeFromHandle = typeof(HorizontalStackLayout);
+			AddTypeAttributes(typeFromHandle, new ContentPropertyAttribute("Children"));
+			typeFromHandle = typeof(VerticalStackLayout);
+			AddTypeAttributes(typeFromHandle, new ContentPropertyAttribute("Children"));
+
+			typeFromHandle = typeof(GroupableItemsView);
+			typeFromHandle = typeof(Image);
+			typeFromHandle = typeof(ImageButton);
+			typeFromHandle = typeof(IndicatorView);
+			AddTypeAttributes(typeFromHandle, new ContentPropertyAttribute("IndicatorLayout"));
+			typeFromHandle = typeof(InputView);
+			AddTypeAttributes(typeFromHandle, new TypeConverterAttribute(typeof(StringConverter)));
+			typeFromHandle = typeof(Label);
+			AddTypeAttributes(typeFromHandle, new ContentPropertyAttribute("Text"));
+			typeFromHandle = typeof(LayoutOptions);
+			AddTypeAttributes(typeFromHandle, new TypeConverterAttribute(typeof(StructOptionsConverter<LayoutOptions>)));
+			typeFromHandle = typeof(Line);
+			typeFromHandle = typeof(LinearItemsLayout);
+			AddTypeAttributes(typeFromHandle, new TypeConverterAttribute(typeof(StructOptionsConverter<LinearItemsLayout>)));
+			typeFromHandle = typeof(ListView);
+			typeFromHandle = typeof(FlyoutPage);
+			AddTypeAttributes(typeFromHandle, new ContentPropertyAttribute("Detail"));
+#pragma warning disable CS0618 // Type or member is obsolete
+			typeFromHandle = typeof(MasterDetailPage);
+#pragma warning restore CS0618 // Type or member is obsolete
+			AddTypeAttributes(typeFromHandle, new ContentPropertyAttribute("Detail"));
+			typeFromHandle = typeof(NavigationPage);
+			typeFromHandle = typeof(OpenGLView);
+			typeFromHandle = typeof(Page);
+			typeFromHandle = typeof(Path);
+			typeFromHandle = typeof(Picker);
+			typeFromHandle = typeof(Polygon);
+			typeFromHandle = typeof(Polyline);
+			typeFromHandle = typeof(ProgressBar);
+			typeFromHandle = typeof(RadioButton);
+			typeFromHandle = typeof(Rectangle);
+			typeFromHandle = typeof(RefreshView);
+			AddTypeAttributes(typeFromHandle, new ContentPropertyAttribute("Content"));
+			typeFromHandle = typeof(RelativeLayout);
+			AddTypeAttributes(typeFromHandle, new ContentPropertyAttribute("Children"));
+			typeFromHandle = typeof(ResourcesChangedEventArgs);
+			AddTypeAttributes(typeFromHandle, new TypeConverterAttribute(typeof(StructOptionsConverter<ResourcesChangedEventArgs>)));
+			typeFromHandle = typeof(ScrollView);
+			AddTypeAttributes(typeFromHandle, new ContentPropertyAttribute("Content"));
+			typeFromHandle = typeof(SearchBar);
+			typeFromHandle = typeof(SelectableItemsView);
+			typeFromHandle = typeof(Shell);
+			AddTypeAttributes(typeFromHandle, new ContentPropertyAttribute("Items"));
+			typeFromHandle = typeof(Size);
+			AddTypeAttributes(typeFromHandle, new TypeConverterAttribute(typeof(StructOptionsConverter<Size>)));
+			typeFromHandle = typeof(Slider);
+			typeFromHandle = typeof(StackLayout);
+			AddTypeAttributes(typeFromHandle, new ContentPropertyAttribute("Children"));
+			typeFromHandle = typeof(Stepper);
+			typeFromHandle = typeof(StructuredItemsView);
+			typeFromHandle = typeof(SwipeItemView);
+			AddTypeAttributes(typeFromHandle, new ContentPropertyAttribute("Content"));
+			typeFromHandle = typeof(SwipeView);
+			AddTypeAttributes(typeFromHandle, new ContentPropertyAttribute("Content"));
+			typeFromHandle = typeof(Switch);
+			typeFromHandle = typeof(TabbedPage);
+			AddTypeAttributes(typeFromHandle, new ContentPropertyAttribute("Children"));
+			typeFromHandle = typeof(TableView);
+			AddTypeAttributes(typeFromHandle, new ContentPropertyAttribute("Root"));
+			typeFromHandle = typeof(TemplatedPage);
+			typeFromHandle = typeof(TemplatedView);
+			typeFromHandle = typeof(TimePicker);
+			typeFromHandle = typeof(View);
+			AddTypeAttributes(typeFromHandle, new TypeConverterAttribute(typeof(StringConverter)));
+			typeFromHandle = typeof(WebView);
+
+			AddCustomAttributes(typeof(AbsoluteLayout).Assembly, new XmlnsSupportsValidationAttribute("http://schemas.microsoft.com/dotnet/2021/maui", supportsValidation: false));
+			AddCallback(typeof(Style), delegate (AttributeCallbackBuilder builder)
+			{
+				builder.AddCustomAttributes(new EditorBrowsableAttribute(EditorBrowsableState.Always), new ContentPropertyAttribute("Setters"), new TypeConverterAttribute(typeof(StringConverter)));
+			});
+			AddCallback(typeof(Setter), delegate (AttributeCallbackBuilder builder)
+			{
+				builder.AddCustomAttributes(new EditorBrowsableAttribute(EditorBrowsableState.Always), new ContentPropertyAttribute("Value"));
+			});
+			foreach (Type item in from t in typeof(View).Assembly.ExportedTypes
+								  where typeof(IFontElement).IsAssignableFrom(t)
+								  select t)
+			{
+				AddCallback(item, delegate (AttributeCallbackBuilder builder)
+				{
+					builder.AddCustomAttributes("FontSize", new TypeConverterAttribute(typeof(NonExclusiveEnumConverter<NamedSize>)));
+				});
+			}
+			AddCallback(typeof(VisualElement), delegate (AttributeCallbackBuilder builder)
+			{
+				builder.AddCustomAttributes("Visual", new TypeConverterAttribute(typeof(VisualDesignTypeConverter)));
+			});
+			AddCallback(typeof(ItemsView), delegate (AttributeCallbackBuilder builder)
+			{
+				builder.AddCustomAttributes("ItemsLayout", new TypeConverterAttribute(typeof(ItemsLayoutDesignTypeConverter)));
+			});
+			AddCallback(typeof(InputView), delegate (AttributeCallbackBuilder builder)
+			{
+				builder.AddCustomAttributes("Keyboard", new TypeConverterAttribute(typeof(KeyboardDesignTypeConverter)));
+			});
+			AddCallback(typeof(EntryCell), delegate (AttributeCallbackBuilder builder)
+			{
+				builder.AddCustomAttributes("Keyboard", new TypeConverterAttribute(typeof(KeyboardDesignTypeConverter)));
+			});
+			AddCallback(typeof(OnPlatform<>), delegate (AttributeCallbackBuilder builder)
+			{
+				builder.AddCustomAttributes(new EditorBrowsableAttribute(EditorBrowsableState.Always));
+			});
+			AddCallback(typeof(OnIdiom<>), delegate (AttributeCallbackBuilder builder)
+			{
+				builder.AddCustomAttributes(new EditorBrowsableAttribute(EditorBrowsableState.Always));
+			});
+		}
+
+		private void AddTypeAttributes(Type type, params Attribute[] attribs)
+		{
+			AddCallback(type, delegate (AttributeCallbackBuilder builder)
+			{
+				builder.AddCustomAttributes(attribs);
+			});
+		}
+	}
+
+	internal class StructOptionsConverter<T> : System.ComponentModel.TypeConverter
+	{
+		private static Lazy<string[]> StandardValues = new Lazy<string[]>(() => (from fi in typeof(T).GetFields().Where(delegate (FieldInfo fi)
+		{
+			if (fi.IsStatic && fi.IsPublic)
+			{
+				return !fi.CustomAttributes.Any((CustomAttributeData a) => a.AttributeType == typeof(ObsoleteAttribute));
+			}
+			return false;
+		}) select fi.Name).Union(from pi in typeof(T).GetProperties().Where(delegate (PropertyInfo pi)
+			{
+				if (pi.GetAccessors(nonPublic: true)[0].IsStatic && pi.GetAccessors(nonPublic: true)[0].IsPublic)
+				{
+					return !pi.CustomAttributes.Any((CustomAttributeData a) => a.AttributeType == typeof(ObsoleteAttribute));
+				}
+				return false;
+			}) select pi.Name).ToArray());
+
+		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+		{
+			return sourceType == typeof(string);
+		}
+
+		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+		{
+			if (value != null && StandardValues.Value.Contains(value.ToString()))
+			{
+				return null;
+			}
+			return base.ConvertFrom(context, culture, value);
+		}
+
+		public override bool IsValid(ITypeDescriptorContext context, object value)
+		{
+			if (value == null)
+			{
+				return false;
+			}
+			if (!StandardValues.Value.Contains(value.ToString()))
+			{
+				return value.GetType().FullName.StartsWith("Microsoft.Maui.Controls.OnPlatform");
+			}
+			return true;
+		}
+
+		public override bool GetStandardValuesSupported(ITypeDescriptorContext context)
+		{
+			return true;
+		}
+
+		public override bool GetStandardValuesExclusive(ITypeDescriptorContext context)
+		{
+			return false;
+		}
+
+		public override System.ComponentModel.TypeConverter.StandardValuesCollection GetStandardValues(ITypeDescriptorContext context)
+		{
+			return new System.ComponentModel.TypeConverter.StandardValuesCollection(StandardValues.Value);
+		}
 	}
 
 	internal class AnythingConverter : System.ComponentModel.TypeConverter
diff --git a/src/Controls/src/Core.Design/Controls.Core.Design-net6.csproj b/src/Controls/src/Core.Design/Controls.Core.Design-net6.csproj
index 5c5986b0611c..9d6e7437ba73 100644
--- a/src/Controls/src/Core.Design/Controls.Core.Design-net6.csproj
+++ b/src/Controls/src/Core.Design/Controls.Core.Design-net6.csproj
@@ -1,30 +1,34 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net6.0</TargetFrameworks>
-		<AssemblyName>Microsoft.Maui.Controls.Core.Design</AssemblyName>
+		<TargetFrameworks>net472</TargetFrameworks>
+		<AssemblyName>Microsoft.Maui.Controls.Design</AssemblyName>
 		<EnableDefaultCompileItems>False</EnableDefaultCompileItems>
+		<Packable>False</Packable>
+		<_MauiDesignDllBuild Condition=" '$(OS)' != 'Unix' And '$(MSBuildRuntimeType)' == 'Full'">True</_MauiDesignDllBuild>
 	</PropertyGroup>
-	<PropertyGroup>
-		<PackageId>Microsoft.Maui.Controls.Core.Design</PackageId>
-	</PropertyGroup>
-	<ItemGroup Condition=" '$(OS)' != 'Unix' ">
+	<ItemGroup Condition=" '$(_MauiDesignDllBuild)' == 'True' ">
 		<Reference Include="Microsoft.Windows.Design.Extensibility, Version=4.3.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
 			<SpecificVersion>True</SpecificVersion>
+			<HintPath>$(MSBuildToolsPath)\..\..\..\Common7\IDE\PublicAssemblies\Microsoft.Windows.Design.Extensibility.dll</HintPath>
 		</Reference>
+		<Reference Include="System.Xaml" />
 		<Compile Include="AttributeTableBuilder.cs" />
+		<Compile Include="NamedColorsConverter.cs" />
 		<Compile Include="EnumConverter.cs" />
 		<Compile Include="NonExclusiveEnumConverter.cs" />
 		<Compile Include="Properties\AssemblyInfo.cs" />
 		<Compile Include="RegisterMetadata.cs" />
 		<Compile Include="VisualDesignTypeConverter.cs" />
-	</ItemGroup>
-	<ItemGroup>
-		<ProjectReference Include="..\..\..\Core\src\Core.csproj" />
-		<ProjectReference Include="..\Core\Controls.Core.csproj">
+		<Compile Include="ItemsLayoutDesignTypeConverter.cs" />
+		<Compile Include="KeyboardDesignTypeConverter.cs" />
+		<Compile Include="EasingDesignTypeConverter.cs" />
+		<ProjectReference Include="..\..\..\Core\src\Core-net6.csproj" />
+		<ProjectReference Include="..\Core\Controls.Core-net6.csproj">
 			<GenerateDesignMetadata>true</GenerateDesignMetadata>
 			<Private>False</Private>
 		</ProjectReference>
 	</ItemGroup>
+
 	<!-- The IDE will look for a top level assembly resource called 'Microsoft.Maui.toolbox.xml' to -->
 	<!-- load the toolbox metadata from.                                                           -->
 	<ItemGroup>
@@ -32,11 +36,6 @@
 			<LogicalName>Microsoft.Maui.toolbox.xml</LogicalName>
 		</EmbeddedResource>
 	</ItemGroup>
-	<ItemGroup>
-		<Compile Include="ItemsLayoutDesignTypeConverter.cs" />
-		<Compile Include="KeyboardDesignTypeConverter.cs" />
-		<Compile Include="EasingDesignTypeConverter.cs" />
-	</ItemGroup>
 
 	<!-- Ensure that all images in the 'mac' and 'win' subdirectories are included as embedded resources -->
 	<!-- using a defined format. That format is "{platform}.{imagename}". We will look up images using   -->
diff --git a/src/Controls/src/Core.Design/NamedColorsConverter.cs b/src/Controls/src/Core.Design/NamedColorsConverter.cs
new file mode 100644
index 000000000000..91d0fb4247bf
--- /dev/null
+++ b/src/Controls/src/Core.Design/NamedColorsConverter.cs
@@ -0,0 +1,102 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Globalization;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Microsoft.Maui.Controls.Core.Design
+{
+	public class NamedColorsConverter : System.ComponentModel.TypeConverter
+	{
+		class NameColorMapping
+		{
+			public NameColorMapping(string name, Graphics.Color color)
+			{
+				Name = name;
+				Color = color;
+			}
+
+			public string Name { get; set; }
+			public Graphics.Color Color { get; set; }
+		}
+
+		public NamedColorsConverter()
+			: base()
+		{
+			NamedColors = new List<NameColorMapping>();
+
+			var fields = typeof(Graphics.Colors)
+					.GetFields(BindingFlags.Static | BindingFlags.Public);
+
+			foreach (var f in fields)
+			{
+				if (f.GetValue(null) is Graphics.Color c)
+					NamedColors.Add(new NameColorMapping(f.Name, c));
+			}
+		}
+
+		List<NameColorMapping> NamedColors { get; }
+
+		// String -> Color
+		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+		{
+			if (sourceType == typeof(string))
+				return true;
+
+			return base.CanConvertFrom(context, sourceType);
+		}
+
+		// Color -> String
+		public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
+			=> true;
+
+		// String -> Color
+		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+		{
+			var strVal = value?.ToString();
+
+			if (string.IsNullOrEmpty(strVal))
+				return Graphics.Colors.Black;
+
+			var namedColor = NamedColors.FirstOrDefault(n => n.Name.Equals(strVal))?.Color;
+
+			if (namedColor != null)
+				return namedColor;
+
+			try
+			{
+				return Graphics.Color.FromHex(strVal.TrimStart('#'));
+			}
+			catch { }
+
+			return Graphics.Colors.Black;
+		}
+
+		// Color -> String
+		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
+		{
+			if (value is Graphics.Color c)
+			{
+				var f = NamedColors.FirstOrDefault(n => n.Color.Equals(c));
+				if (f != null)
+					return f.Name;
+
+				return $"#{c.ToHex()}";
+			}
+
+			return null;
+		}
+
+		public override bool GetStandardValuesSupported(ITypeDescriptorContext context)
+			=> true;
+
+		public override bool GetStandardValuesExclusive(ITypeDescriptorContext context)
+			=> false;
+
+		public override StandardValuesCollection GetStandardValues(ITypeDescriptorContext context)
+			=> new(NamedColors.Select(c => c.Name).ToArray());
+	}
+}
diff --git a/src/Controls/src/Core.Design/Properties/AssemblyInfo.cs b/src/Controls/src/Core.Design/Properties/AssemblyInfo.cs
index dcc6c5419572..b218e0bb35eb 100644
--- a/src/Controls/src/Core.Design/Properties/AssemblyInfo.cs
+++ b/src/Controls/src/Core.Design/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 using Microsoft.Windows.Design.Metadata;
 
-[assembly: ProvideMetadata(typeof(Microsoft.Maui.Controls.Core.Design.RegisterMetadata))]
\ No newline at end of file
+[assembly: ProvideMetadata(typeof(Microsoft.Maui.Controls.Core.Design.RegisterMetadata))]
diff --git a/src/Controls/src/Core/AppHostBuilderExtensions.cs b/src/Controls/src/Core/AppHostBuilderExtensions.cs
new file mode 100644
index 000000000000..89265b7c40d9
--- /dev/null
+++ b/src/Controls/src/Core/AppHostBuilderExtensions.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Maui.Controls.Handlers;
+using Microsoft.Maui.Hosting;
+
+namespace Microsoft.Maui.Controls.Hosting
+{
+	public static class AppHostBuilderExtensions
+	{
+		static readonly Dictionary<Type, Type> DefaultMauiControlHandlers = new Dictionary<Type, Type>
+		{
+			{ typeof(NavigationPage), typeof(NavigationPageHandler) },
+		};
+
+		public static IAppHostBuilder UseMauiControlsHandlers(this IAppHostBuilder builder)
+		{
+			return builder
+				.ConfigureMauiHandlers((_, handlersCollection) => handlersCollection.AddHandlers(DefaultMauiControlHandlers))
+				.ConfigureServices(ConfigureNativeServices);
+		}
+
+		private static void ConfigureNativeServices(HostBuilderContext arg1, IServiceCollection arg2)
+		{
+#if WINDOWS
+			if (!UI.Xaml.Application.Current.Resources.ContainsKey("MauiControlsPageControlStyle"))
+			{
+				var myResourceDictionary = new Microsoft.UI.Xaml.ResourceDictionary();
+				myResourceDictionary.Source = new Uri("ms-appx:///Microsoft.Maui.Controls/Platform/Windows/Styles/Resources.xbf");
+				Microsoft.UI.Xaml.Application.Current.Resources.MergedDictionaries.Add(myResourceDictionary);
+			}
+#endif
+		}
+	}
+}
diff --git a/src/Controls/src/Core/Application.cs b/src/Controls/src/Core/Application.cs
index 576a435c3918..e4b362d9f1f5 100644
--- a/src/Controls/src/Core/Application.cs
+++ b/src/Controls/src/Core/Application.cs
@@ -19,7 +19,6 @@ public partial class Application : Element, IResourcesProvider, IApplicationCont
 
 		IAppIndexingProvider _appIndexProvider;
 		ReadOnlyCollection<Element> _logicalChildren;
-		Page _mainPage;
 
 		static readonly SemaphoreSlim SaveSemaphore = new SemaphoreSlim(1, 1);
 
@@ -56,37 +55,82 @@ public IAppLinks AppLinks
 
 		public static Application Current { get; set; }
 
+		// TODO MAUI. What should this be?
 		public Page MainPage
 		{
-			get { return _mainPage; }
+			get
+			{
+				if (Windows.Count == 0)
+					return null;
+
+				return Windows[0].View as Page;
+			}
 			set
 			{
 				if (value == null)
 					throw new ArgumentNullException("value");
 
-				if (_mainPage == value)
+				if (MainPage == value)
 					return;
 
-				OnPropertyChanging();
-				if (_mainPage != null)
+				if (Windows.Count == 0)
 				{
-					InternalChildren.Remove(_mainPage);
-
-					_mainPage.Parent = null;
+					OnPropertyChanging();
+					AddWindow(new Window(value));
+					OnPropertyChanged();
 				}
+				else
+				{
+					var mainPage = MainPage;
 
-				_mainPage = value;
+					if (mainPage == value)
+						return;
 
-				if (_mainPage != null)
-				{
-					_mainPage.Parent = this;
-					_mainPage.NavigationProxy.Inner = NavigationProxy;
-					InternalChildren.Add(_mainPage);
+					OnPropertyChanging();
+					if (mainPage != null)
+						mainPage.Parent = null;
+
+					Windows[0].View = (IView)value;
+
+					if (mainPage != null)
+						mainPage.NavigationProxy.Inner = NavigationProxy;
+
+					OnPropertyChanged();
 				}
-				OnPropertyChanged();
 			}
 		}
 
+		//public Page MainPage
+		//{
+		//	get { return _mainPage; }
+		//	set
+		//	{
+		//		if (value == null)
+		//			throw new ArgumentNullException("value");
+
+		//		if (_mainPage == value)
+		//			return;
+
+		//		OnPropertyChanging();
+		//		if (_mainPage != null)
+		//		{
+		//			InternalChildren.Remove(_mainPage);
+		//			_mainPage.Parent = null;
+		//		}
+
+		//		_mainPage = value;
+
+		//		if (_mainPage != null)
+		//		{
+		//			_mainPage.Parent = this;
+		//			_mainPage.NavigationProxy.Inner = NavigationProxy;
+		//			InternalChildren.Add(_mainPage);
+		//		}
+
+		//		OnPropertyChanged();
+		//	}
+		//}
+
 		public IDictionary<string, object> Properties
 		{
 			get
@@ -277,14 +321,10 @@ protected virtual void OnStart()
 		{
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
-		public static void ClearCurrent() => Current = null;
+		internal static void ClearCurrent() => Current = null;
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
-		public static bool IsApplicationOrNull(Element element)
-		{
-			return element == null || element is Application;
-		}
+		internal static bool IsApplicationOrNull(object element) =>
+			element == null || element is IApplication || element is IWindow;
 
 		internal override void OnParentResourcesChanged(IEnumerable<KeyValuePair<string, object>> values)
 		{
@@ -401,12 +441,13 @@ protected internal virtual void CleanUp()
 			// Unhook everything that's referencing the main page so it can be collected
 			// This only comes up if we're disposing of an embedded Forms app, and will
 			// eventually go away when we fully support multiple windows
-			if (_mainPage != null)
-			{
-				InternalChildren.Remove(_mainPage);
-				_mainPage.Parent = null;
-				_mainPage = null;
-			}
+			// TODO MAUI
+			//if (_mainPage != null)
+			//{
+			//	InternalChildren.Remove(_mainPage);
+			//	_mainPage.Parent = null;
+			//	_mainPage = null;
+			//}
 
 			NavigationProxy = null;
 		}
diff --git a/src/Controls/src/Core/ArrayExtensions.cs b/src/Controls/src/Core/ArrayExtensions.cs
new file mode 100644
index 000000000000..c3433082f1a7
--- /dev/null
+++ b/src/Controls/src/Core/ArrayExtensions.cs
@@ -0,0 +1,39 @@
+using System;
+using Microsoft.Maui.Controls.Internals;
+
+namespace Microsoft.Maui.Controls.Platform
+{
+	internal static class ArrayExtensions
+	{
+		public static T[] Insert<T>(this T[] self, int index, T item)
+		{
+			var result = new T[self.Length + 1];
+			if (index > 0)
+				Array.Copy(self, result, index);
+
+			result[index] = item;
+
+			if (index < self.Length)
+				Array.Copy(self, index, result, index + 1, result.Length - index - 1);
+
+			return result;
+		}
+
+		public static T[] Remove<T>(this T[] self, T item)
+		{
+			return self.RemoveAt(self.IndexOf(item));
+		}
+
+		public static T[] RemoveAt<T>(this T[] self, int index)
+		{
+			var result = new T[self.Length - 1];
+			if (index > 0)
+				Array.Copy(self, result, index);
+
+			if (index < self.Length - 1)
+				Array.Copy(self, index + 1, result, index, self.Length - index - 1);
+
+			return result;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/src/Core/Brush.cs b/src/Controls/src/Core/Brush.cs
index 7836991eb184..1314ab5fae74 100644
--- a/src/Controls/src/Core/Brush.cs
+++ b/src/Controls/src/Core/Brush.cs
@@ -3,7 +3,7 @@
 namespace Microsoft.Maui.Controls
 {
 	[TypeConverter(typeof(BrushTypeConverter))]
-	public abstract class Brush : Element
+	public abstract partial class Brush : Element
 	{
 		public static Brush Default
 		{
diff --git a/src/Controls/src/Core/ColorExtensions.Windows.cs b/src/Controls/src/Core/ColorExtensions.Windows.cs
new file mode 100644
index 000000000000..236067522af8
--- /dev/null
+++ b/src/Controls/src/Core/ColorExtensions.Windows.cs
@@ -0,0 +1,28 @@
+using System;
+using Windows.UI;
+using Microsoft.UI;
+using Microsoft.Maui.Graphics;
+using WBrush = Microsoft.UI.Xaml.Media.Brush;
+using WSolidColorBrush = Microsoft.UI.Xaml.Media.SolidColorBrush;
+
+namespace Microsoft.Maui.Controls.Platform
+{
+	public static partial class ColorExtensions
+	{
+		[Obsolete("ToBrush is obsolete. Please use ToNative instead")]
+		public static WBrush ToBrush(this Graphics.Color color) => color.ToNative();
+
+
+		[Obsolete("ToFormsColor is obsolete. Please use ToColor instead")]
+		public static Graphics.Color ToFormsColor(this Windows.UI.Color color)
+		{
+			return color.ToColor();
+		}
+
+		[Obsolete("ToFormsColor is obsolete. Please use ToColor instead")]
+		public static Graphics.Color ToFormsColor(this WSolidColorBrush solidColorBrush)
+		{
+			return solidColorBrush.Color.ToColor();
+		}
+	}
+}
diff --git a/src/Controls/src/Core/ColorExtensions.cs b/src/Controls/src/Core/ColorExtensions.cs
index dc37ac04143c..3cca6fc50372 100644
--- a/src/Controls/src/Core/ColorExtensions.cs
+++ b/src/Controls/src/Core/ColorExtensions.cs
@@ -2,7 +2,7 @@
 
 namespace Microsoft.Maui.Controls
 {
-	public static class ColorExtensions
+	public static partial class ColorExtensions
 	{
 		public static bool IsDefault(this Graphics.Color color)
 		{
@@ -14,16 +14,5 @@ public static bool IsNotDefault(this Graphics.Color color)
 			return !IsDefault(color);
 		}
 	}
-
-	public static class KnownColor
-	{
-		public static Color Default => null;
-
-		public static Color Transparent { get; } = new(255, 255, 255, 0);
-
-		public static void SetAccent(Color value) => Accent = value;
-
-		public static Color Accent { get; internal set; }
-	}
 }
 
diff --git a/src/Controls/src/Core/CompatServiceProvider.cs b/src/Controls/src/Core/CompatServiceProvider.cs
new file mode 100644
index 000000000000..f6a0df20ea01
--- /dev/null
+++ b/src/Controls/src/Core/CompatServiceProvider.cs
@@ -0,0 +1,55 @@
+#nullable enable
+using System;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using Microsoft.Maui.Hosting.Internal;
+
+namespace Microsoft.Maui.Controls
+{
+	// TODO: Remove this and use the real service provider.
+	static class CompatServiceProvider
+	{
+		static IServiceProvider? _serviceProvider;
+		static IEmbeddedFontLoader? _embeddedFontLoader;
+
+		public static IServiceProvider ServiceProvider => _serviceProvider ??= CreateCompatServiceProvider();
+
+		public static IFontRegistrar FontRegistrar => ServiceProvider.GetRequiredService<IFontRegistrar>();
+
+		public static IFontManager FontManager => ServiceProvider.GetRequiredService<IFontManager>();
+
+		public static ILoggerFactory LoggerFactory => ServiceProvider.GetRequiredService<ILoggerFactory>();
+
+		public static void SetFontLoader(Type loaderType)
+		{
+			if (_embeddedFontLoader != null)
+				return;
+
+			_embeddedFontLoader = (IEmbeddedFontLoader)Activator.CreateInstance(loaderType)!;
+			if (FontRegistrar is FontRegistrar fr)
+				fr.SetFontLoader(_embeddedFontLoader);
+		}
+
+		public static void SetServiceProvider(IServiceProvider services)
+		{
+			if (_serviceProvider != null)
+				throw new InvalidOperationException("The service provider can only be set once.");
+
+			_serviceProvider = services;
+			_embeddedFontLoader = _serviceProvider.GetService<IEmbeddedFontLoader>();
+		}
+
+		static IServiceProvider CreateCompatServiceProvider()
+		{
+			var collection = new MauiServiceCollection();
+
+			collection.AddSingleton<ILoggerFactory, FallbackLoggerFactory>();
+			collection.AddSingleton<IFontRegistrar>(svc => new FontRegistrar(_embeddedFontLoader, svc.CreateLogger<FontRegistrar>()));
+			collection.AddSingleton<IFontManager>(svc => new FontManager(svc.GetRequiredService<IFontRegistrar>(), svc.CreateLogger<FontManager>()));
+
+			var provider = new MauiServiceProvider(collection, false);
+
+			return provider;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/src/Core/ConstraintExpression.cs b/src/Controls/src/Core/ConstraintExpression.cs
index 7ca41217ec1c..c017645e7cc9 100644
--- a/src/Controls/src/Core/ConstraintExpression.cs
+++ b/src/Controls/src/Core/ConstraintExpression.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using System.Reflection;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Maui.Controls.Internals;
 using Microsoft.Maui.Controls.Xaml;
 
diff --git a/src/Controls/src/Core/Controls.Core-net6.csproj b/src/Controls/src/Core/Controls.Core-net6.csproj
index ec5841e72792..b1197ebdcd00 100644
--- a/src/Controls/src/Core/Controls.Core-net6.csproj
+++ b/src/Controls/src/Core/Controls.Core-net6.csproj
@@ -1,25 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
-   <PropertyGroup>
+  <PropertyGroup>
     <TargetFrameworks>netstandard2.0;$(MauiPlatforms)</TargetFrameworks>
     <RootNamespace>Microsoft.Maui.Controls</RootNamespace>
     <AssemblyName>Microsoft.Maui.Controls</AssemblyName>
     <Nullable>disable</Nullable>
+    <NoWarn>$(NoWarn);NU5128</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
     <PackageId>Microsoft.Maui.Controls</PackageId>
   </PropertyGroup>
-	<ItemGroup>
-		<Compile Remove="Internals\Legacy\**" />
-		<EmbeddedResource Remove="Internals\Legacy\**" />
-		<None Remove="Internals\Legacy\**" />
-	</ItemGroup>
-	<ItemGroup>
-	  <Folder Include="Xaml\Diagnostics\" />
-	</ItemGroup>
-	<ItemGroup>
-	  <ProjectReference Include="..\..\..\Core\src\Core-net6.csproj" />
-	</ItemGroup>
-	<PropertyGroup>
+  <Import Project="..\..\..\..\.nuspec\Microsoft.Maui.Controls.MultiTargeting.targets" />
+  <ItemGroup>
+    <Compile Remove="Internals\Legacy\**" />
+    <EmbeddedResource Remove="Internals\Legacy\**" />
+    <None Remove="Internals\Legacy\**" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Core\src\Core-net6.csproj" />
+  </ItemGroup>
+  <PropertyGroup>
     <GitInfoReportImportance>high</GitInfoReportImportance>
   </PropertyGroup>
   <Target Name="Net6WinUIWorkaround" BeforeTargets="_GetSdkToolsPathsFromSdk" Condition="$(TargetFramework.Contains('-windows')) == true ">
@@ -27,4 +26,17 @@
       <TargetPlatformIdentifierAdjusted>UAP</TargetPlatformIdentifierAdjusted>
     </PropertyGroup>
   </Target>
+
+
+  <PropertyGroup>
+    <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);_MauiPackXamlDesignAssemblies</TargetsForTfmSpecificBuildOutput>
+  </PropertyGroup>
+
+  <Target Name="_MauiPackXamlDesignAssemblies">
+    <ItemGroup>
+      <BuildOutputInPackage Include="..\Core.Design\bin\$(Configuration)\net472\Microsoft.Maui.Controls.Design.dll">
+        <TargetPath>Design</TargetPath>
+      </BuildOutputInPackage>
+    </ItemGroup>
+  </Target>
 </Project>
diff --git a/src/Controls/src/Core/Controls.Core.csproj b/src/Controls/src/Core/Controls.Core.csproj
index 00b146aafa64..4fa3f7d06a74 100644
--- a/src/Controls/src/Core/Controls.Core.csproj
+++ b/src/Controls/src/Core/Controls.Core.csproj
@@ -1,19 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="MSBuild.Sdk.Extras">
 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
+		<TargetFrameworks>netstandard2.1;netstandard2.0;$(NonNet6Platforms)</TargetFrameworks>
 		<AssemblyName>Microsoft.Maui.Controls</AssemblyName>
 	</PropertyGroup>
 	<PropertyGroup>
 		<PackageId>Microsoft.Maui.Controls</PackageId>
 	</PropertyGroup>
+	<Import Project="..\..\..\..\.nuspec\Microsoft.Maui.Controls.MultiTargeting.targets" />
 	<ItemGroup>
 		<Compile Remove="Internals\Legacy\**" />
 		<EmbeddedResource Remove="Internals\Legacy\**" />
 		<None Remove="Internals\Legacy\**" />
 	</ItemGroup>
-	<ItemGroup>
-		<Folder Include="Xaml\Diagnostics\" />
-	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\..\..\Core\src\Core.csproj" />
 	</ItemGroup>
diff --git a/src/Controls/src/Core/DragAndDrop/DragGestureRecognizer.cs b/src/Controls/src/Core/DragAndDrop/DragGestureRecognizer.cs
index cf96e22d0fb2..11ac65ddaff0 100644
--- a/src/Controls/src/Core/DragAndDrop/DragGestureRecognizer.cs
+++ b/src/Controls/src/Core/DragAndDrop/DragGestureRecognizer.cs
@@ -79,7 +79,7 @@ public void SendDropCompleted(DropCompletedEventArgs args)
 		}
 
 		[EditorBrowsable(EditorBrowsableState.Never)]
-		public DragStartingEventArgs SendDragStarting(VisualElement element)
+		public DragStartingEventArgs SendDragStarting(IView element)
 		{
 			var args = new DragStartingEventArgs();
 
diff --git a/src/Controls/src/Core/DragAndDrop/DropGestureRecognizer.cs b/src/Controls/src/Core/DragAndDrop/DropGestureRecognizer.cs
index 9b03fd2abc05..121f60fcf35a 100644
--- a/src/Controls/src/Core/DragAndDrop/DropGestureRecognizer.cs
+++ b/src/Controls/src/Core/DragAndDrop/DropGestureRecognizer.cs
@@ -99,13 +99,13 @@ public async Task SendDrop(DropEventArgs args)
 			{
 				var dataView = args.Data;
 				var internalProperties = dataView.PropertiesInternal;
-				VisualElement dragSource = null;
+				IView dragSource = null;
 				ImageSource sourceTarget = await dataView.GetImageAsync();
 				string text = await dataView.GetTextAsync();
 
 				if (internalProperties.ContainsKey("DragSource"))
 				{
-					dragSource = (VisualElement)internalProperties["DragSource"];
+					dragSource = (IView)internalProperties["DragSource"];
 					if (sourceTarget == null && dragSource is IImageElement imageElement)
 						sourceTarget = imageElement.Source;
 
diff --git a/src/Controls/src/Core/EnumerableExtensions.cs b/src/Controls/src/Core/EnumerableExtensions.cs
index e179716407f9..72e1c92375e5 100644
--- a/src/Controls/src/Core/EnumerableExtensions.cs
+++ b/src/Controls/src/Core/EnumerableExtensions.cs
@@ -43,14 +43,6 @@ public static IEnumerable<T> GetGesturesFor<T>(this IEnumerable<IGestureRecogniz
 			}
 		}
 
-		internal static IEnumerable<T> Append<T>(this IEnumerable<T> enumerable, T item)
-		{
-			foreach (T x in enumerable)
-				yield return x;
-
-			yield return item;
-		}
-
 		public static void ForEach<T>(this IEnumerable<T> enumeration, Action<T> action)
 		{
 			foreach (T item in enumeration)
@@ -103,13 +95,5 @@ public static int IndexOf<T>(this IEnumerable<T> enumerable, Func<T, bool> predi
 
 			return -1;
 		}
-
-		public static IEnumerable<T> Prepend<T>(this IEnumerable<T> enumerable, T item)
-		{
-			yield return item;
-
-			foreach (T x in enumerable)
-				yield return x;
-		}
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/src/Core/FileImageSource.cs b/src/Controls/src/Core/FileImageSource.cs
index 61be50df4c2a..e313483676b3 100644
--- a/src/Controls/src/Core/FileImageSource.cs
+++ b/src/Controls/src/Core/FileImageSource.cs
@@ -3,7 +3,7 @@
 namespace Microsoft.Maui.Controls
 {
 	[TypeConverter(typeof(FileImageSourceConverter))]
-	public sealed class FileImageSource : ImageSource
+	public sealed partial class FileImageSource : ImageSource
 	{
 		public static readonly BindableProperty FileProperty = BindableProperty.Create("File", typeof(string), typeof(FileImageSource), default(string));
 
diff --git a/src/Controls/src/Core/FontAttributes.cs b/src/Controls/src/Core/FontAttributes.cs
index a4096c665216..6a71c04e8cd4 100644
--- a/src/Controls/src/Core/FontAttributes.cs
+++ b/src/Controls/src/Core/FontAttributes.cs
@@ -3,6 +3,14 @@
 
 namespace Microsoft.Maui.Controls
 {
+	[Flags]
+	public enum FontAttributes
+	{
+		None = 0,
+		Bold = 1 << 0,
+		Italic = 1 << 1
+	}
+
 	[Xaml.TypeConversion(typeof(FontAttributes))]
 	public sealed class FontAttributesConverter : TypeConverter
 	{
diff --git a/src/Controls/src/Core/FontElement.cs b/src/Controls/src/Core/FontElement.cs
index df11ac226c47..278f2dc23261 100644
--- a/src/Controls/src/Core/FontElement.cs
+++ b/src/Controls/src/Core/FontElement.cs
@@ -47,11 +47,8 @@ static void OnFontPropertyChanged(BindableObject bindable, object oldValue, obje
 			else
 			{
 				bindable.SetValue(FontFamilyProperty, font.FontFamily);
-				if (font.UseNamedSize)
-					bindable.SetValue(FontSizeProperty, Device.GetNamedSize(font.NamedSize, bindable.GetType(), true));
-				else
-					bindable.SetValue(FontSizeProperty, font.FontSize);
-				bindable.SetValue(FontAttributesProperty, font.FontAttributes);
+				bindable.SetValue(FontSizeProperty, font.FontSize);
+				bindable.SetValue(FontAttributesProperty, font.GetFontAttributes());
 			}
 			SetCancelEvents(bindable, false);
 		}
@@ -70,7 +67,7 @@ static void OnFontFamilyChanged(BindableObject bindable, object oldValue, object
 			if (fontFamily != null)
 				bindable.SetValue(FontProperty, Font.OfSize(fontFamily, fontSize).WithAttributes(fontAttributes));
 			else
-				bindable.SetValue(FontProperty, Font.SystemFontOfSize(fontSize, fontAttributes));
+				bindable.SetValue(FontProperty, Font.SystemFontOfSize(fontSize).WithAttributes(fontAttributes));
 
 			SetCancelEvents(bindable, false);
 			((IFontElement)bindable).OnFontFamilyChanged((string)oldValue, (string)newValue);
@@ -90,7 +87,7 @@ static void OnFontSizeChanged(BindableObject bindable, object oldValue, object n
 			if (fontFamily != null)
 				bindable.SetValue(FontProperty, Font.OfSize(fontFamily, fontSize).WithAttributes(fontAttributes));
 			else
-				bindable.SetValue(FontProperty, Font.SystemFontOfSize(fontSize, fontAttributes));
+				bindable.SetValue(FontProperty, Font.SystemFontOfSize(fontSize).WithAttributes(fontAttributes));
 
 			SetCancelEvents(bindable, false);
 			((IFontElement)bindable).OnFontSizeChanged((double)oldValue, (double)newValue);
@@ -115,7 +112,7 @@ static void OnFontAttributesChanged(BindableObject bindable, object oldValue, ob
 			if (fontFamily != null)
 				bindable.SetValue(FontProperty, Font.OfSize(fontFamily, fontSize).WithAttributes(fontAttributes));
 			else
-				bindable.SetValue(FontProperty, Font.SystemFontOfSize(fontSize, fontAttributes));
+				bindable.SetValue(FontProperty, Font.SystemFontOfSize(fontSize).WithAttributes(fontAttributes));
 
 			SetCancelEvents(bindable, false);
 			((IFontElement)bindable).OnFontAttributesChanged((FontAttributes)oldValue, (FontAttributes)newValue);
diff --git a/src/Controls/src/Core/FontExtensions.cs b/src/Controls/src/Core/FontExtensions.cs
new file mode 100644
index 000000000000..8b966fec9092
--- /dev/null
+++ b/src/Controls/src/Core/FontExtensions.cs
@@ -0,0 +1,27 @@
+#nullable enable
+using System;
+using Microsoft.Maui;
+namespace Microsoft.Maui.Controls
+{
+	public static class FontExtensions
+	{
+		public static Font WithAttributes(this Font font, FontAttributes attributes)
+		{
+			var bold = (attributes & FontAttributes.Bold) != 0;
+			var italic = (attributes & FontAttributes.Italic) != 0;
+			return font.WithWeight(bold ? FontWeight.Bold : FontWeight.Regular, italic ? FontSlant.Italic : FontSlant.Default);
+		}
+		public static FontAttributes GetFontAttributes(this Font font)
+		{
+			FontAttributes attributes = font.Weight == FontWeight.Bold ? FontAttributes.Bold : FontAttributes.None;
+			if (font.FontSlant != FontSlant.Default)
+			{
+				if (attributes == FontAttributes.None)
+					attributes = FontAttributes.Italic;
+				else
+					attributes = attributes | FontAttributes.Italic;
+			}
+			return attributes;
+		}
+	}
+}
diff --git a/src/Controls/src/Core/FontImageSource.cs b/src/Controls/src/Core/FontImageSource.cs
index 6038c2dfdc14..711fbacceda9 100644
--- a/src/Controls/src/Core/FontImageSource.cs
+++ b/src/Controls/src/Core/FontImageSource.cs
@@ -2,7 +2,7 @@
 
 namespace Microsoft.Maui.Controls
 {
-	public class FontImageSource : ImageSource
+	public partial class FontImageSource : ImageSource
 	{
 		public override bool IsEmpty => string.IsNullOrEmpty(Glyph);
 
diff --git a/src/Controls/src/Core/FontTypeConverter.cs b/src/Controls/src/Core/FontTypeConverter.cs
index 58df2ac9eab7..2b21bfc1bccc 100644
--- a/src/Controls/src/Core/FontTypeConverter.cs
+++ b/src/Controls/src/Core/FontTypeConverter.cs
@@ -69,12 +69,12 @@ public override object ConvertFromInvariantString(string value)
 				if (name != null)
 				{
 					if (size == -1)
-						return Font.OfSize(name, namedSize).WithAttributes(attributes);
+						size = Device.GetNamedSize(namedSize, null, false);
 					return Font.OfSize(name, size).WithAttributes(attributes);
 				}
 				if (size == -1)
-					return Font.SystemFontOfSize(namedSize, attributes);
-				return Font.SystemFontOfSize(size, attributes);
+					return Font.SystemFontOfSize(Device.GetNamedSize(namedSize, null, false)).WithAttributes(attributes);
+				return Font.SystemFontOfSize(size).WithAttributes(attributes);
 			}
 
 			throw new InvalidOperationException(string.Format("Cannot convert \"{0}\" into {1}", value, typeof(Font)));
@@ -87,9 +87,9 @@ public override string ConvertToInvariantString(object value)
 			var parts = new List<string>();
 			if (!string.IsNullOrEmpty(font.FontFamily))
 				parts.Add(font.FontFamily);
-			if ((font.FontAttributes & FontAttributes.Bold) == FontAttributes.Bold)
+			if (font.Weight == FontWeight.Bold)
 				parts.Add("Bold");
-			if ((font.FontAttributes & FontAttributes.Italic) == FontAttributes.Italic)
+			if (font.FontSlant != FontSlant.Default)
 				parts.Add("Italic");
 			parts.Add($"{font.FontSize}");
 			return string.Join(", ", parts);
diff --git a/src/Controls/src/Core/HandlerImpl/Application.Impl.cs b/src/Controls/src/Core/HandlerImpl/Application.Impl.cs
index 73b2efffbd3a..a78d5c6eebfc 100644
--- a/src/Controls/src/Core/HandlerImpl/Application.Impl.cs
+++ b/src/Controls/src/Core/HandlerImpl/Application.Impl.cs
@@ -1,10 +1,38 @@
 using System;
+using System.Collections.Generic;
 
 namespace Microsoft.Maui.Controls
 {
 	public partial class Application : IApplication
 	{
-		public virtual IWindow CreateWindow(IActivationState activationState)
+		List<IWindow> _windows = new List<IWindow>();
+		public IReadOnlyList<IWindow> Windows => _windows.AsReadOnly();
+
+		IWindow IApplication.CreateWindow(IActivationState activationState)
+		{
+			IWindow window = CreateWindow(activationState);
+
+			AddWindow(window);
+
+			return window;
+		}
+
+		void AddWindow(IWindow window)
+		{
+			_windows.Add(window);
+
+			if (window is Element windowElement)
+			{
+				windowElement.Parent = this;
+				InternalChildren.Add(windowElement);
+				OnChildAdded(windowElement);
+			}
+
+			if (window is NavigableElement ne)
+				ne.NavigationProxy.Inner = NavigationProxy;
+		}
+
+		protected virtual IWindow CreateWindow(IActivationState activationState)
 		{
 			throw new NotImplementedException();
 		}
diff --git a/src/Controls/src/Core/HandlerImpl/Brush.Impl.cs b/src/Controls/src/Core/HandlerImpl/Brush.Impl.cs
new file mode 100644
index 000000000000..cf0ceb9f4af3
--- /dev/null
+++ b/src/Controls/src/Core/HandlerImpl/Brush.Impl.cs
@@ -0,0 +1,82 @@
+using Microsoft.Maui.Graphics;
+using GraphicsGradientStop = Microsoft.Maui.Graphics.GradientStop;
+
+namespace Microsoft.Maui.Controls
+{
+	public partial class Brush
+	{
+		public static implicit operator Brush(Paint paint)
+		{
+			if (paint is SolidPaint solidPaint)
+				return new SolidColorBrush { Color = solidPaint.Color };
+
+			if (paint is GradientPaint gradientPaint)
+			{
+				var gradientStopCollection = gradientPaint.GradientStops;
+
+				GradientStopCollection gradientStops = new GradientStopCollection();
+
+				for (int i = 0; i < gradientStopCollection.Length; i++)
+				{
+					var gs = gradientStopCollection[i];
+					gradientStops[i] = new GradientStop(gs.Color, gs.Offset);
+				}
+
+				if (gradientPaint is LinearGradientPaint linearGradientPaint)
+				{
+					var startPoint = linearGradientPaint.StartPoint;
+					var endPoint = linearGradientPaint.EndPoint;
+
+					return new LinearGradientBrush { GradientStops = gradientStops, StartPoint = startPoint, EndPoint = endPoint };
+				}
+
+				if (gradientPaint is RadialGradientPaint radialGradientPaint)
+				{
+					var center = radialGradientPaint.Center;
+					var radius = radialGradientPaint.Radius;
+
+					return new RadialGradientBrush { GradientStops = gradientStops, Center = center, Radius = radius };
+				}
+			}
+
+			return null;
+		}
+
+		public static implicit operator Paint(Brush brush)
+		{
+			if (brush is SolidColorBrush solidColorBrush)
+				return new SolidPaint { Color = solidColorBrush.Color };
+
+			if (brush is GradientBrush gradientBrush)
+			{
+				var gradientStopCollection = gradientBrush.GradientStops;
+
+				GraphicsGradientStop[] gradientStops = new GraphicsGradientStop[gradientStopCollection.Count];
+
+				for (int i = 0; i < gradientStopCollection.Count; i++)
+				{
+					var gs = gradientStopCollection[i];
+					gradientStops[i] = new GraphicsGradientStop(gs.Offset, gs.Color);
+				}
+
+				if (gradientBrush is LinearGradientBrush linearGradientBrush)
+				{
+					var startPoint = linearGradientBrush.StartPoint;
+					var endPoint = linearGradientBrush.EndPoint;
+
+					return new LinearGradientPaint { GradientStops = gradientStops, StartPoint = startPoint, EndPoint = endPoint };
+				}
+
+				if (gradientBrush is RadialGradientBrush radialGradientBrush)
+				{
+					var center = radialGradientBrush.Center;
+					var radius = radialGradientBrush.Radius;
+
+					return new RadialGradientPaint { GradientStops = gradientStops, Center = center, Radius = radius };
+				}
+			}
+
+			return null;
+		}
+	}
+}
diff --git a/src/Controls/src/Core/HandlerImpl/ContentPage.Impl.cs b/src/Controls/src/Core/HandlerImpl/ContentPage.Impl.cs
index 411f533b17e3..316f07b3d9a9 100644
--- a/src/Controls/src/Core/HandlerImpl/ContentPage.Impl.cs
+++ b/src/Controls/src/Core/HandlerImpl/ContentPage.Impl.cs
@@ -10,12 +10,9 @@ public partial class ContentPage : IPage, HotReload.IHotReloadableView
 		// TODO ezhart That there's a layout alignment here tells us this hierarchy needs work :) 
 		public Primitives.LayoutAlignment HorizontalLayoutAlignment => Primitives.LayoutAlignment.Fill;
 
-		// TODO ezhart super sus
-		public Thickness Margin => Thickness.Zero;
-
 		IView IPage.Content => Content;
 
-		
+
 
 		protected override Size MeasureOverride(double widthConstraint, double heightConstraint)
 		{
@@ -35,7 +32,7 @@ protected override Size ArrangeOverride(Rectangle bounds)
 			if (Content is IFrameworkElement element)
 			{
 				element.Arrange(bounds);
-				element.Handler?.SetFrame(element.Frame);
+				element.Handler?.NativeArrange(element.Frame);
 			}
 
 			return Frame.Size;
diff --git a/src/Controls/src/Core/HandlerImpl/Editor.Impl.cs b/src/Controls/src/Core/HandlerImpl/Editor.Impl.cs
index d06b0ae9180d..d9739b65a84a 100644
--- a/src/Controls/src/Core/HandlerImpl/Editor.Impl.cs
+++ b/src/Controls/src/Core/HandlerImpl/Editor.Impl.cs
@@ -5,5 +5,10 @@ public partial class Editor : IEditor
 		Font? _font;
 
 		Font ITextStyle.Font => _font ??= Font.OfSize(FontFamily, FontSize).WithAttributes(FontAttributes);
+
+		void IEditor.Completed()
+		{
+			(this as IEditorController).SendCompleted();
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/src/Core/HandlerImpl/Entry.Impl.cs b/src/Controls/src/Core/HandlerImpl/Entry.Impl.cs
index 23124142a31d..68d11698d879 100644
--- a/src/Controls/src/Core/HandlerImpl/Entry.Impl.cs
+++ b/src/Controls/src/Core/HandlerImpl/Entry.Impl.cs
@@ -5,5 +5,10 @@ public partial class Entry : IEntry
 		Font? _font;
 
 		Font ITextStyle.Font => _font ??= Font.OfSize(FontFamily, FontSize).WithAttributes(FontAttributes);
+
+		void IEntry.Completed()
+		{
+			(this as IEntryController).SendCompleted();
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/src/Core/HandlerImpl/Image.Impl.cs b/src/Controls/src/Core/HandlerImpl/Image.Impl.cs
new file mode 100644
index 000000000000..3efaadad212a
--- /dev/null
+++ b/src/Controls/src/Core/HandlerImpl/Image.Impl.cs
@@ -0,0 +1,31 @@
+namespace Microsoft.Maui.Controls
+{
+	public partial class Image : IImage
+	{
+		IImageSource IImageSourcePart.Source => Source;
+
+		void IImageSourcePart.UpdateIsLoading(bool isLoading) =>
+			IsLoading = isLoading;
+	}
+
+	public partial class ImageSource : IImageSource
+	{
+	}
+
+	public partial class FileImageSource : IFileImageSource
+	{
+	}
+
+	public partial class StreamImageSource : IStreamImageSource
+	{
+	}
+
+	public partial class UriImageSource : IUriImageSource, IStreamImageSource
+	{
+	}
+
+	public partial class FontImageSource : IFontImageSource
+	{
+		Font IFontImageSource.Font => Font.OfSize(FontFamily, Size);
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/src/Core/HandlerImpl/NavigationPage.Impl.cs b/src/Controls/src/Core/HandlerImpl/NavigationPage.Impl.cs
new file mode 100644
index 000000000000..2c172d6cfdd6
--- /dev/null
+++ b/src/Controls/src/Core/HandlerImpl/NavigationPage.Impl.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Graphics;
+
+namespace Microsoft.Maui.Controls
+{
+	public partial class NavigationPage : IView
+	{
+		Thickness IView.Margin => Thickness.Zero;
+
+		protected override Size MeasureOverride(double widthConstraint, double heightConstraint)
+		{
+			if (Content is IFrameworkElement frameworkElement)
+			{
+				frameworkElement.Measure(widthConstraint, heightConstraint);
+			}
+
+			return new Size(widthConstraint, heightConstraint);
+		}
+
+		protected override Size ArrangeOverride(Rectangle bounds)
+		{
+			// Update the Bounds (Frame) for this page
+			Layout(bounds);
+
+			if (Content is IFrameworkElement element)
+			{
+				element.Arrange(bounds);
+				element.Handler?.NativeArrange(element.Frame);
+			}
+
+			return Frame.Size;
+		}
+
+		IFrameworkElement Content =>
+			this.CurrentPage;
+	}
+
+}
diff --git a/src/Controls/src/Core/HandlerImpl/Page.Impl.cs b/src/Controls/src/Core/HandlerImpl/Page.Impl.cs
new file mode 100644
index 000000000000..0f1483000e6c
--- /dev/null
+++ b/src/Controls/src/Core/HandlerImpl/Page.Impl.cs
@@ -0,0 +1,13 @@
+using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Graphics;
+
+namespace Microsoft.Maui.Controls
+{
+	public partial class Page : IPage
+	{
+		IView IPage.Content => null;
+
+		// TODO ezhart super sus
+		public Thickness Margin => Thickness.Zero;
+	}
+}
diff --git a/src/Controls/src/Core/HandlerImpl/Picker.Impl.cs b/src/Controls/src/Core/HandlerImpl/Picker.Impl.cs
index ebaacb0cd48a..9d45fde0f53c 100644
--- a/src/Controls/src/Core/HandlerImpl/Picker.Impl.cs
+++ b/src/Controls/src/Core/HandlerImpl/Picker.Impl.cs
@@ -5,5 +5,19 @@ public partial class Picker : IPicker
 		Font? _font;
 
 		Font ITextStyle.Font => _font ??= Font.OfSize(FontFamily, FontSize).WithAttributes(FontAttributes);
+
+		int IItemDelegate<string>.GetCount() => Items?.Count ?? ItemsSource?.Count ?? 0;
+
+		string IItemDelegate<string>.GetItem(int index)
+		{
+			if (index < 0)
+				return "";
+			if (index < Items?.Count)
+				return Items[index];
+			if (index < ItemsSource?.Count)
+				return GetDisplayMember(ItemsSource[index]);
+			return "";
+		}
+
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/src/Core/HandlerImpl/RadioButton.Impl.cs b/src/Controls/src/Core/HandlerImpl/RadioButton.Impl.cs
new file mode 100644
index 000000000000..b894ec203bb0
--- /dev/null
+++ b/src/Controls/src/Core/HandlerImpl/RadioButton.Impl.cs
@@ -0,0 +1,6 @@
+namespace Microsoft.Maui.Controls
+{
+	public partial class RadioButton : IRadioButton
+	{
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/src/Core/HandlerImpl/SearchBar.Impl.cs b/src/Controls/src/Core/HandlerImpl/SearchBar.Impl.cs
index bd383aebde42..104bbb69c4ee 100644
--- a/src/Controls/src/Core/HandlerImpl/SearchBar.Impl.cs
+++ b/src/Controls/src/Core/HandlerImpl/SearchBar.Impl.cs
@@ -7,5 +7,10 @@ public partial class SearchBar : ISearchBar
 		Font ITextStyle.Font => _font ??= Font.OfSize(FontFamily, FontSize).WithAttributes(FontAttributes);
 
 		bool ITextInput.IsTextPredictionEnabled => true;
+
+		void ISearchBar.SearchButtonPressed()
+		{
+			(this as ISearchBarController).OnSearchButtonPressed();
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/src/Core/HandlerImpl/VisualElement.Impl.cs b/src/Controls/src/Core/HandlerImpl/VisualElement.Impl.cs
index 294ca8dbd24a..07d411e3974d 100644
--- a/src/Controls/src/Core/HandlerImpl/VisualElement.Impl.cs
+++ b/src/Controls/src/Core/HandlerImpl/VisualElement.Impl.cs
@@ -1,8 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Diagnostics;
 using System.Runtime.CompilerServices;
-using System.Text;
 using Microsoft.Maui.Graphics;
 using Microsoft.Maui.Layouts;
 
@@ -10,7 +7,8 @@ namespace Microsoft.Maui.Controls
 {
 	public partial class VisualElement : IFrameworkElement
 	{
-		private IViewHandler _handler;
+		Semantics _semantics;
+		IViewHandler _handler;
 
 		public Rectangle Frame => Bounds;
 
@@ -24,6 +22,18 @@ public IViewHandler Handler
 			}
 		}
 
+		Paint IFrameworkElement.Background
+		{
+			get
+			{
+				if (!Brush.IsNullOrEmpty(Background))
+					return Background;
+				if (BackgroundColor.IsNotDefault())
+					return new SolidColorBrush(BackgroundColor);
+				return null;
+			}
+		}
+
 		protected override void OnPropertyChanged([CallerMemberName] string propertyName = null)
 		{
 			base.OnPropertyChanged(propertyName);
@@ -44,12 +54,53 @@ Size IFrameworkElement.Arrange(Rectangle bounds)
 			return ArrangeOverride(bounds);
 		}
 
+		// The CloseEnough methods will likely go away once we get rid of the cause (see comments below); if not, we'll
+		// add a proper extension method or add a compare method to MG with a tolerance parameter
+		bool CloseEnough(double a, double b)
+		{
+			const double tolerance = 0.0001;
+
+			return (Math.Abs(a - b) < tolerance);
+		}
+
+		bool CloseEnough(Rectangle currentBounds, Rectangle newBounds)
+		{
+			if (!CloseEnough(currentBounds.X, newBounds.X))
+			{
+				return false;
+			}
+
+			if (!CloseEnough(currentBounds.Y, newBounds.Y))
+			{
+				return false;
+			}
+
+			if (!CloseEnough(currentBounds.Width, newBounds.Width))
+			{
+				return false;
+			}
+
+			if (!CloseEnough(currentBounds.Height, newBounds.Height))
+			{
+				return false;
+			}
+
+			return true;
+		}
+
 		// ArrangeOverride provides a way to allow subclasses (e.g., Layout) to override Arrange even though
 		// the interface has to be explicitly implemented to avoid conflict with the old Arrange method
 		protected virtual Size ArrangeOverride(Rectangle bounds)
 		{
-			// Setting Bounds here is equivalent to setting the Frame
-			Bounds = this.ComputeFrame(bounds);
+			// We check the previous bounds here to avoid getting into a loop caused by the OnSizeAllocated override
+			// in View.cs; the arrange it forces ends up back here and if we have a margin, ComputeFrame will 
+			// keep applying it in a loop until the element disappears. Hopefully we can remove the OnSizeAllocated 
+			// hack at some point and avoid this extra check.
+			if (!CloseEnough(Bounds, bounds))
+			{
+				// Setting Bounds here is equivalent to setting the Frame
+				Bounds = this.ComputeFrame(bounds);
+			}
 
 			return Frame.Size;
 		}
@@ -66,9 +117,7 @@ void IFrameworkElement.InvalidateMeasure()
 
 		// InvalidateMeasureOverride provides a way to allow subclasses (e.g., Layout) to override InvalidateMeasure even though
 		// the interface has to be explicitly implemented to avoid conflict with the VisualElement.InvalidateMeasure method
-		protected virtual void InvalidateMeasureOverride()
-		{
-		}
+		protected virtual void InvalidateMeasureOverride() => Handler?.UpdateValue(nameof(IFrameworkElement.InvalidateMeasure));
 
 		void IFrameworkElement.InvalidateArrange()
 		{
@@ -91,8 +140,9 @@ protected virtual Size MeasureOverride(double widthConstraint, double heightCons
 		Primitives.LayoutAlignment IFrameworkElement.HorizontalLayoutAlignment => default;
 		Primitives.LayoutAlignment IFrameworkElement.VerticalLayoutAlignment => default;
 
-		Maui.Semantics _semantics;
-		Maui.Semantics IFrameworkElement.Semantics
+		Visibility IFrameworkElement.Visibility => IsVisible.ToVisibility();
+
+		Semantics IFrameworkElement.Semantics
 		{
 			get => _semantics;
 		}
@@ -100,9 +150,9 @@ Maui.Semantics IFrameworkElement.Semantics
 		// We don't want to initialize Semantics until someone explicitly 
 		// wants to modify some aspect of the semantics class
 		internal Semantics SetupSemantics() =>
-			_semantics ??= new Maui.Semantics();
+			_semantics ??= new Semantics();
 
 		double IFrameworkElement.Width => WidthRequest;
-		double IFrameworkElement.Height => HeightRequest; 
+		double IFrameworkElement.Height => HeightRequest;
 	}
 }
diff --git a/src/Controls/src/Core/HandlerImpl/Window.Impl.cs b/src/Controls/src/Core/HandlerImpl/Window.Impl.cs
new file mode 100644
index 000000000000..614012f85628
--- /dev/null
+++ b/src/Controls/src/Core/HandlerImpl/Window.Impl.cs
@@ -0,0 +1,86 @@
+#nullable enable
+
+using System;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+
+namespace Microsoft.Maui.Controls
+{
+	public class Window : VisualElement, IWindow
+	{
+		ReadOnlyCollection<Element>? _logicalChildren;
+		Page? _page;
+
+		ObservableCollection<Element> InternalChildren { get; } = new ObservableCollection<Element>();
+
+		internal override ReadOnlyCollection<Element> LogicalChildrenInternal =>
+			_logicalChildren ??= new ReadOnlyCollection<Element>(InternalChildren);
+
+		public Window()
+		{
+			InternalChildren.CollectionChanged += OnCollectionChanged;
+		}
+
+		public Window(Page page)
+			: this()
+		{
+			Page = page;
+		}
+
+
+		void SendWindowAppearing()
+		{
+			Page?.SendAppearing();
+		}
+
+		void OnCollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
+		{
+			if (e.OldItems != null)
+			{
+				for (var i = 0; i < e.OldItems.Count; i++)
+				{
+					var item = (Element?)e.OldItems[i];
+					OnChildRemoved(item, e.OldStartingIndex + i);
+				}
+			}
+
+			if (e.NewItems != null)
+			{
+				foreach (Element item in e.NewItems)
+				{
+					OnChildAdded(item);
+
+					// TODO once we have better life cycle events on pages 
+					if (item is Page)
+					{
+						SendWindowAppearing();
+					}
+				}
+			}
+		}
+
+		public Page? Page
+		{
+			get => _page;
+			set
+			{
+				if (_page != null)
+					InternalChildren.Remove(_page);
+
+				_page = value;
+
+				if (_page != null)
+					InternalChildren.Add(_page);
+
+				if (value is NavigableElement ne)
+					ne.NavigationProxy.Inner = NavigationProxy;
+			}
+		}
+
+		IView IWindow.View
+		{
+			get => Page ?? throw new InvalidOperationException("No page was set on the window.");
+			set => Page = (Page)value;
+		}
+	}
+}
diff --git a/src/Controls/src/Core/Handlers/NavigationPage/NavigationPageHandler.Android.cs b/src/Controls/src/Core/Handlers/NavigationPage/NavigationPageHandler.Android.cs
new file mode 100644
index 000000000000..acfe3637c03c
--- /dev/null
+++ b/src/Controls/src/Core/Handlers/NavigationPage/NavigationPageHandler.Android.cs
@@ -0,0 +1,277 @@
+#nullable enable
+
+using System;
+using System.Collections.Generic;
+using Android.Runtime;
+using Android.Views;
+using AndroidX.AppCompat.Widget;
+using AndroidX.Navigation;
+using AndroidX.Navigation.Fragment;
+using AndroidX.Navigation.UI;
+using Google.Android.Material.AppBar;
+using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Controls.Platform;
+using Microsoft.Maui.Handlers;
+using AView = Android.Views.View;
+
+namespace Microsoft.Maui.Controls.Handlers
+{
+	public partial class NavigationPageHandler :
+		ViewHandler<NavigationPage, AView>
+	//, IManageFragments, IOnClickListener, ILifeCycleState
+	{
+		private NavHostFragment? _navHost;
+		private FragmentNavigator? _fragmentNavigator;
+		private Toolbar? _toolbar;
+		private AppBarLayout? _appBar;
+
+		NavHostFragment NavHost
+		{
+			get => _navHost ?? throw new InvalidOperationException($"NavHost cannot be null");
+			set => _navHost = value;
+		}
+
+		FragmentNavigator FragmentNavigator
+		{
+			get => _fragmentNavigator ?? throw new InvalidOperationException($"FragmentNavigator cannot be null");
+			set => _fragmentNavigator = value;
+		}
+
+		int NativeNavigationStackCount => NavHost?.NavController.BackStack.Size() - 1 ?? 0;
+		int NavigationStackCount => VirtualView?.Navigation.NavigationStack.Count ?? 0;
+
+		internal Toolbar Toolbar
+		{
+			get => _toolbar ?? throw new InvalidOperationException($"ToolBar cannot be null");
+			set => _toolbar = value;
+		}
+
+		internal AppBarLayout AppBar
+		{
+			get => _appBar ?? throw new InvalidOperationException($"AppBar cannot be null");
+			set => _appBar = value;
+		}
+
+		protected override AView CreateNativeView()
+		{
+			LayoutInflater? li = LayoutInflater.From(ContextWithValidation());
+			_ = li ?? throw new InvalidOperationException($"LayoutInflater cannot be null");
+
+			var view = li.Inflate(Resource.Layout.navigationlayout, null).JavaCast<NavigationLayout>();
+			_ = view ?? throw new InvalidOperationException($"Resource.Layout.navigationlayout view not found");
+
+			_toolbar = view.FindViewById<Toolbar>(Resource.Id.maui_toolbar);
+			_appBar = view.FindViewById<AppBarLayout>(Resource.Id.appbar);
+			return view;
+		}
+
+		protected override void ConnectHandler(AView nativeView)
+		{
+			var fragmentManager = ContextWithValidation().GetFragmentManager();
+			_ = fragmentManager ?? throw new InvalidOperationException($"GetFragmentManager returned null");
+			_ = VirtualView ?? throw new InvalidOperationException($"VirtualView cannot be null");
+
+			NavHost = (NavHostFragment)
+				fragmentManager.FindFragmentById(Resource.Id.nav_host);
+
+			FragmentNavigator =
+				(FragmentNavigator)NavHost
+					.NavController
+					.NavigatorProvider
+					.GetNavigator(Java.Lang.Class.FromType(typeof(FragmentNavigator)));
+
+
+			var navGraphNavigator =
+				(NavGraphNavigator)NavHost
+					.NavController
+					.NavigatorProvider
+					.GetNavigator(Java.Lang.Class.FromType(typeof(NavGraphNavigator)));
+
+			base.ConnectHandler(nativeView);
+
+			INavigationPageController navController = VirtualViewWithValidation();
+			navController.PushRequested += OnPushed;
+			navController.PopRequested += OnPopped;
+			var inflater = NavHost.NavController.NavInflater;
+			NavGraph graph = new NavGraph(navGraphNavigator);
+
+			NavDestination navDestination;
+			List<int> destinations = new List<int>();
+			foreach (var page in VirtualView.Navigation.NavigationStack)
+			{
+				navDestination =
+					MauiFragmentNavDestination.
+						AddDestination(
+							page,
+							this,
+							graph,
+							FragmentNavigator);
+
+				destinations.Add(navDestination.Id);
+			}
+
+			graph.StartDestination = destinations[0];
+
+			NavHost.NavController.SetGraph(graph, null);
+
+			for (var i = NativeNavigationStackCount; i < NavigationStackCount; i++)
+			{
+				var dest = destinations[i];
+				NavHost.NavController.Navigate(dest);
+			}
+		}
+
+		protected override void DisconnectHandler(AView nativeView)
+		{
+			base.DisconnectHandler(nativeView);
+			var navController = (INavigationPageController)VirtualViewWithValidation();
+			navController.PushRequested -= OnPushed;
+			navController.PopRequested -= OnPopped;
+		}
+
+		void OnPushed(object? sender, NavigationRequestedEventArgs e)
+		{
+			var destination =
+				MauiFragmentNavDestination.AddDestination(e.Page, this, NavHost.NavController.Graph, FragmentNavigator);
+
+			NavHost.NavController.Navigate(destination.Id, null);
+		}
+
+		internal void OnPop()
+		{
+			VirtualViewWithValidation()
+				.Navigation
+				.PopAsync()
+				.FireAndForget((e) =>
+			{
+				Log.Warning(nameof(NavigationPageHandler), $"{e}");
+			});
+		}
+
+		void OnPopped(object? sender, NavigationRequestedEventArgs e)
+		{
+			NavHost.NavController.NavigateUp();
+		}
+
+		void UpdatePadding()
+		{
+		}
+
+		void UpdateBarTextColor()
+		{
+			UpdateBarBackground();
+		}
+
+		void UpdateBarBackground()
+		{
+			var context = Context;
+			var bar = Toolbar;
+			//ActionBarDrawerToggle toggle = _drawerToggle;
+
+			if (bar == null)
+				return;
+
+			//bool isNavigated = NavigationPageController.StackDepth > 1;
+			//bar.NavigationIcon = null;
+			var navPage = VirtualViewWithValidation();
+
+			//if (isNavigated)
+			//{
+			//	if (NavigationPage.GetHasBackButton(currentPage) && !Context.IsDesignerContext())
+			//	{
+			//		if (toggle != null)
+			//		{
+			//			toggle.DrawerIndicatorEnabled = false;
+			//			toggle.SyncState();
+			//		}
+
+			//		var activity = (AppCompatActivity)context.GetActivity();
+			//		var icon = new DrawerArrowDrawable(activity.SupportActionBar.ThemedContext);
+			//		icon.Progress = 1;
+			//		bar.NavigationIcon = icon;
+
+			//		var prevPage = Element.Peek(1);
+			//		var backButtonTitle = NavigationPage.GetBackButtonTitle(prevPage);
+			//		_defaultNavigationContentDescription = backButtonTitle != null
+			//			? bar.SetNavigationContentDescription(prevPage, backButtonTitle)
+			//			: bar.SetNavigationContentDescription(prevPage, _defaultNavigationContentDescription);
+			//	}
+			//	else if (toggle != null && _flyoutPage != null)
+			//	{
+			//		toggle.DrawerIndicatorEnabled = _flyoutPage.ShouldShowToolbarButton();
+			//		toggle.SyncState();
+			//	}
+			//}
+			//else
+			//{
+			//	if (toggle != null && _flyoutPage != null)
+			//	{
+			//		toggle.DrawerIndicatorEnabled = _flyoutPage.ShouldShowToolbarButton();
+			//		toggle.SyncState();
+			//	}
+			//}
+
+			var tintColor = navPage.BarBackgroundColor;
+			Brush barBackground = navPage.BarBackground;
+
+			if (barBackground == null && tintColor != null)
+				barBackground = new SolidColorBrush(tintColor);
+
+			if (barBackground != null)
+				bar.UpdateBackground(barBackground);
+			//else if (tintColor == null)
+			//	bar.BackgroundTintMode = null;
+			//else
+			//{
+			//	bar.Background = null;
+			//	bar.BackgroundTintMode = PorterDuff.Mode.Src;
+			//	bar.BackgroundTintList = ColorStateList.ValueOf(tintColor.ToNative());
+			//}
+
+			var textColor = navPage.BarTextColor;
+			if (textColor != null)
+				bar.SetTitleTextColor(textColor.ToNative().ToArgb());
+
+			//var navIconColor = NavigationPage.GetIconColor(currentPage);
+			//if (navIconColor != null && bar.NavigationIcon != null)
+			//	DrawableExtensions.SetColorFilter(bar.NavigationIcon, navIconColor, FilterMode.SrcAtop);
+
+			bar.Title = navPage.CurrentPage?.Title ?? string.Empty;
+
+			//if (_toolbar.NavigationIcon != null && textColor != null)
+			//{
+			//	var icon = _toolbar.NavigationIcon as DrawerArrowDrawable;
+			//	if (icon != null)
+			//		icon.Color = textColor.ToAndroid().ToArgb();
+			//}
+
+			//UpdateTitleIcon();
+
+			//UpdateTitleView();
+		}
+
+		void UpdateTitleIcon()
+		{
+		}
+		void UpdateTitleView()
+		{
+		}
+
+
+		public static void MapPadding(NavigationPageHandler handler, NavigationPage view)
+			=> handler.UpdatePadding();
+
+		public static void MapBarTextColor(NavigationPageHandler handler, NavigationPage view)
+			=> handler.UpdateBarTextColor();
+
+		public static void MapBarBackground(NavigationPageHandler handler, NavigationPage view)
+			=> handler.UpdateBarBackground();
+
+		// TODO MAUI: Task Based Mappers?
+		public static void MapTitleIcon(NavigationPageHandler handler, NavigationPage view)
+			=> handler.UpdateTitleIcon();
+
+		public static void MapTitleView(NavigationPageHandler handler, NavigationPage view)
+			=> handler.UpdateTitleView();
+	}
+}
diff --git a/src/Controls/src/Core/Handlers/NavigationPage/NavigationPageHandler.Standard.cs b/src/Controls/src/Core/Handlers/NavigationPage/NavigationPageHandler.Standard.cs
new file mode 100644
index 000000000000..c8aff483fe58
--- /dev/null
+++ b/src/Controls/src/Core/Handlers/NavigationPage/NavigationPageHandler.Standard.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.Maui.Handlers;
+
+namespace Microsoft.Maui.Controls.Handlers
+{
+	public partial class NavigationPageHandler :
+		ViewHandler<NavigationPage, object>
+	{
+		protected override object CreateNativeView()
+		{
+			throw new NotImplementedException();
+		}
+
+		public static void MapPadding(NavigationPageHandler handler, NavigationPage view) { }
+
+		public static void MapBarTextColor(NavigationPageHandler handler, NavigationPage view) { }
+
+		public static void MapBarBackground(NavigationPageHandler handler, NavigationPage view) { }
+
+		public static void MapTitleIcon(NavigationPageHandler handler, NavigationPage view) { }
+
+		public static void MapTitleView(NavigationPageHandler handler, NavigationPage view) { }
+	}
+}
diff --git a/src/Controls/src/Core/Handlers/NavigationPage/NavigationPageHandler.Windows.cs b/src/Controls/src/Core/Handlers/NavigationPage/NavigationPageHandler.Windows.cs
new file mode 100644
index 000000000000..0c8e75c4711f
--- /dev/null
+++ b/src/Controls/src/Core/Handlers/NavigationPage/NavigationPageHandler.Windows.cs
@@ -0,0 +1,703 @@
+#nullable enable
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Threading.Tasks;
+using Windows.Devices.Input;
+using Windows.UI.Input;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media.Animation;
+using Windows.UI.Core;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.Maui.Controls.Internals;
+using static Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific.Page;
+using WBrush = Microsoft.UI.Xaml.Media.Brush;
+using WImageSource = Microsoft.UI.Xaml.Media.ImageSource;
+using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Handlers;
+using Microsoft.Maui.Controls.Platform;
+
+namespace Microsoft.Maui.Controls.Handlers
+{
+	public partial class NavigationPageHandler : 
+		ViewHandler<NavigationPage, PageControl>, ITitleProvider, ITitleIconProvider, 
+		ITitleViewProvider, IToolbarProvider, IToolBarForegroundBinder, IViewHandler
+	{
+		Page? _currentPage;
+		Page? _previousPage;
+
+		FlyoutPage? _parentFlyoutPage;
+		TabbedPage? _parentTabbedPage;
+		bool _showTitle = true;
+		VisualElementTracker<Page, PageControl> _tracker;
+		EntranceThemeTransition _transition;
+		bool _parentsLookedUp = false;
+
+		public void BindForegroundColor(AppBar appBar)
+		{
+			SetAppBarForegroundBinding(appBar);
+		}
+
+		public void BindForegroundColor(AppBarButton button)
+		{
+			SetAppBarForegroundBinding(button);
+		}
+
+		protected VisualElementTracker<Page, PageControl> Tracker
+		{
+			get { return _tracker; }
+			set
+			{
+				if (_tracker == value)
+					return;
+
+				if (_tracker != null)
+					_tracker.Dispose();
+
+				_tracker = value;
+			}
+		}
+
+		//public void Dispose()
+		//{
+		//	Dispose(true);
+		//}
+
+		void SetAppBarForegroundBinding(FrameworkElement element)
+		{
+			element.SetBinding(Control.ForegroundProperty,
+				new Microsoft.UI.Xaml.Data.Binding { Path = new PropertyPath("TitleBrush"), Source = NativeView, RelativeSource = new RelativeSource { Mode = RelativeSourceMode.TemplatedParent } });
+		}
+
+		WBrush ITitleProvider.BarBackgroundBrush
+		{
+			set
+			{
+				NativeViewValidation().ToolbarBackground = value;
+				UpdateTitleOnParents();
+			}
+		}
+
+		WBrush ITitleProvider.BarForegroundBrush
+		{
+			set
+			{
+				NativeViewValidation().TitleBrush = value;
+				UpdateTitleOnParents();
+			}
+		}
+
+		bool ITitleProvider.ShowTitle
+		{
+			get { return _showTitle; }
+			set
+			{
+				if (_showTitle == value)
+					return;
+
+				_showTitle = value;
+				UpdateTitleVisible();
+				UpdateTitleOnParents();
+			}
+		}
+
+		public string Title
+		{
+			get { return _currentPage?.Title ?? String.Empty; }
+
+			set { /*Not implemented but required by interface*/ }
+		}
+
+		public WImageSource TitleIcon { get; set; }
+
+		public View? TitleView
+		{
+			get
+			{
+				if (_currentPage == null)
+					return null;
+
+				return NavigationPage.GetTitleView(_currentPage) as View;
+			}
+			set { /*Not implemented but required by interface*/ }
+		}
+
+		Task<CommandBar?> IToolbarProvider.GetCommandBarAsync()
+		{
+			return ((IToolbarProvider)NativeViewValidation())?.GetCommandBarAsync() ??
+				Task<CommandBar?>.FromResult((CommandBar?)null);
+		}
+
+		public event EventHandler<VisualElementChangedEventArgs> ElementChanged;
+
+		public override Size GetDesiredSize(double widthConstraint, double heightConstraint)
+		{
+			if (VirtualView == null)
+				return Size.Zero;
+
+			var constraint = new Windows.Foundation.Size(widthConstraint, heightConstraint);
+			IViewHandler childRenderer = VirtualView.CurrentPage.Handler;
+			FrameworkElement? child = childRenderer.NativeView as FrameworkElement;
+			if (child == null)
+				return Size.Zero;
+
+			double oldWidth = child.Width;
+			double oldHeight = child.Height;
+
+			child.Height = double.NaN;
+			child.Width = double.NaN;
+
+			child.Measure(constraint);
+			var result = new Size(Math.Ceiling(child.DesiredSize.Width), Math.Ceiling(child.DesiredSize.Height));
+
+			child.Width = oldWidth;
+			child.Height = oldHeight;
+
+			return result;
+		}
+
+		protected override PageControl CreateNativeView()
+		{
+			return new PageControl();
+		}
+
+		public override void SetVirtualView(IView view)
+		{
+			base.SetVirtualView(view);
+
+			if (view != null && !(view is NavigationPage))
+				throw new ArgumentException("VirtualView must be a Page", nameof(view));
+
+			if (view is NavigationPage np && np != null && np.CurrentPage is null)
+				throw new InvalidOperationException(
+					"NavigationPage must have a root Page before being used. Either call PushAsync with a valid Page, or pass a Page to the constructor before usage.");
+
+		}
+
+		protected override void ConnectHandler(PageControl nativeView)
+		{
+			base.ConnectHandler(nativeView);
+
+			var virtualView = VirtualViewWithValidation();
+
+			nativeView.PointerPressed += OnPointerPressed;
+			nativeView.SizeChanged += OnNativeSizeChanged;
+			Tracker = new BackgroundTracker<PageControl>(Control.BackgroundProperty) 
+			{
+				Element = virtualView, 
+				Container = NativeView 
+			};
+
+			SetPage(virtualView.CurrentPage, false, false);
+
+			nativeView.Loaded += OnLoaded;
+			nativeView.Unloaded += OnUnloaded;
+
+			nativeView.DataContext = virtualView.CurrentPage;
+
+			// Move this somewhere else
+			LookupRelevantParents();
+
+			// Enforce consistency rules on toolbar (show toolbar if top-level page is Navigation Page)
+			nativeView.ShouldShowToolbar = _parentFlyoutPage == null && _parentTabbedPage == null;
+			if (_parentTabbedPage != null)
+				virtualView.Appearing += OnElementAppearing;
+
+			virtualView.PushRequested += OnPushRequested;
+			virtualView.PopRequested += OnPopRequested;
+			virtualView.PopToRootRequested += OnPopToRootRequested;
+			virtualView.InternalChildren.CollectionChanged += OnChildrenChanged;
+
+			if (!string.IsNullOrEmpty(virtualView.AutomationId))
+				nativeView.SetValue(Microsoft.UI.Xaml.Automation.AutomationProperties.AutomationIdProperty, virtualView.AutomationId);
+
+			PushExistingNavigationStack();
+		}
+
+		protected override void DisconnectHandler(PageControl nativeView)
+		{
+			base.DisconnectHandler(nativeView);
+
+			if (VirtualView == null)
+				return;
+
+			VirtualView.PushRequested -= OnPushRequested;
+			VirtualView.PopRequested -= OnPopRequested;
+			VirtualView.PopToRootRequested -= OnPopToRootRequested;
+			VirtualView.InternalChildren.CollectionChanged -= OnChildrenChanged;
+			nativeView.PointerPressed -= OnPointerPressed;
+			nativeView.SizeChanged -= OnNativeSizeChanged;
+			nativeView.Loaded -= OnLoaded;
+			nativeView.Unloaded -= OnUnloaded;
+
+			VirtualView.SendDisappearing();
+
+			nativeView.PointerPressed -= OnPointerPressed;
+			nativeView.SizeChanged -= OnNativeSizeChanged;
+			nativeView.Loaded -= OnLoaded;
+			nativeView.Unloaded -= OnUnloaded;
+
+			if (_parentTabbedPage != null)
+				VirtualView.Appearing -= OnElementAppearing;
+
+			SetPage(null, false, true);
+			_previousPage = null;
+
+			if (_parentTabbedPage != null)
+				_parentTabbedPage.PropertyChanged -= MultiPagePropertyChanged;
+
+			if (_parentFlyoutPage != null)
+				_parentFlyoutPage.PropertyChanged -= MultiPagePropertyChanged;
+		}
+
+		protected virtual void OnElementChanged(VisualElementChangedEventArgs e)
+		{
+			EventHandler<VisualElementChangedEventArgs> changed = ElementChanged;
+			if (changed != null)
+				changed(this, e);
+		}
+
+		WBrush GetBarBackgroundColorBrush()
+		{
+			object defaultColor = GetDefaultColor();
+
+			if (VirtualViewWithValidation().BarBackgroundColor.IsDefault() && defaultColor != null)
+				return (WBrush)defaultColor;
+
+			return Maui.ColorExtensions.ToNative(VirtualViewWithValidation().BarBackgroundColor);
+		}
+
+		static WBrush? GetBarBackgroundBrush(NavigationPage navigationPage)
+		{
+			var barBackground = navigationPage.BarBackground;
+			object defaultColor = GetDefaultColor();
+
+			if (!Brush.IsNullOrEmpty(barBackground))
+				return barBackground.ToBrush();
+
+			if (navigationPage.BarBackgroundColor != null)
+				return navigationPage.BarBackgroundColor.ToNative();
+
+			if (defaultColor != null)
+				return (WBrush)defaultColor;
+
+			return null;
+		}
+
+		static WBrush GetBarForegroundBrush(NavigationPage navigationPage)
+		{
+			object defaultColor = Microsoft.UI.Xaml.Application.Current.Resources["ApplicationForegroundThemeBrush"];
+			if (navigationPage.BarTextColor.IsDefault())
+				return (WBrush)defaultColor;
+			return Maui.ColorExtensions.ToNative(navigationPage.BarTextColor);
+		}
+
+		bool GetIsNavBarPossible()
+		{
+			return _showTitle;
+		}
+
+		void LookupRelevantParents()
+		{
+			IEnumerable<IPage> parentPages = VirtualViewWithValidation().GetParentPages();
+
+			if (_parentTabbedPage != null)
+				_parentTabbedPage.PropertyChanged -= MultiPagePropertyChanged;
+
+			if (_parentFlyoutPage != null)
+				_parentFlyoutPage.PropertyChanged -= MultiPagePropertyChanged;
+
+			foreach (Page parentPage in parentPages)
+			{
+				_parentTabbedPage = parentPage as TabbedPage;
+				_parentFlyoutPage = parentPage as FlyoutPage;
+			}
+
+			if (_parentTabbedPage != null)
+				_parentTabbedPage.PropertyChanged += MultiPagePropertyChanged;
+			if (_parentFlyoutPage != null)
+				_parentFlyoutPage.PropertyChanged += MultiPagePropertyChanged;
+
+			UpdateShowTitle();
+			UpdateTitleOnParents();
+			_parentsLookedUp = true;
+		}
+
+		void MultiPagePropertyChanged(object? sender, PropertyChangedEventArgs e)
+		{
+			if (e.PropertyName == "CurrentPage" || e.PropertyName == "Detail")
+			{
+				UpdateTitleOnParents();
+				UpdateTitleIcon();
+				UpdateTitleView();
+			}
+		}
+
+		void OnBackClicked(object sender, RoutedEventArgs e)
+		{
+			VirtualView?.SendBackButtonPressed();
+		}
+
+		void OnChildrenChanged(object? sender, NotifyCollectionChangedEventArgs e)
+		{
+			UpdateBackButton();
+		}
+
+		// TODO MAUI: hmmmmmm can we make this not be property changed based?
+		void OnCurrentPagePropertyChanged(object? sender, PropertyChangedEventArgs e)
+		{
+			if (e.PropertyName == NavigationPage.HasBackButtonProperty.PropertyName)
+				UpdateBackButton();
+			else if (e.PropertyName == NavigationPage.BackButtonTitleProperty.PropertyName)
+				UpdateBackButtonTitle();
+			else if (e.PropertyName == NavigationPage.HasNavigationBarProperty.PropertyName)
+				UpdateTitleVisible();
+			else if (e.PropertyName == Page.TitleProperty.PropertyName)
+				UpdateTitleOnParents();
+			else if (e.PropertyName == NavigationPage.TitleIconImageSourceProperty.PropertyName)
+				UpdateTitleIcon();
+			else if (e.PropertyName == NavigationPage.TitleViewProperty.PropertyName)
+				UpdateTitleView();
+		}
+
+		void OnElementAppearing(object? sender, EventArgs e)
+		{
+			UpdateTitleVisible();
+			UpdateBackButton();
+		}
+
+		void OnLoaded(object? sender, RoutedEventArgs args)
+		{
+			if (VirtualView == null)
+				return;
+
+			VirtualView.SendAppearing();
+			UpdateBackButton();
+			UpdateTitleOnParents();
+
+			if (_parentFlyoutPage != null)
+			{
+				UpdateTitleView();
+				UpdateTitleIcon();
+			}
+		}
+
+		void OnNativeSizeChanged(object? sender, SizeChangedEventArgs e)
+		{
+			UpdateContainerArea();
+		}
+
+		void OnPointerPressed(object? sender, PointerRoutedEventArgs e)
+		{
+			if (e.Handled)
+				return;
+
+			var point = e.GetCurrentPoint(NativeView);
+			if (point == null)
+				return;
+
+			if (point.PointerDeviceType != PointerDeviceType.Mouse)
+				return;
+
+			if (point.Properties.IsXButton1Pressed)
+			{
+				e.Handled = true;
+				OnBackClicked(NativeViewValidation(), e);
+			}
+		}
+
+		protected virtual void OnPopRequested(object? sender, NavigationRequestedEventArgs e)
+		{
+			var newCurrent = VirtualViewWithValidation().Peek(1);
+			SetPage(newCurrent, e.Animated, true);
+		}
+
+		protected virtual void OnPopToRootRequested(object? sender, NavigationRequestedEventArgs e)
+		{
+			SetPage(e.Page, e.Animated, true);
+		}
+
+		protected virtual void OnPushRequested(object? sender, NavigationRequestedEventArgs e)
+		{
+			SetPage(e.Page, e.Animated, false);
+		}
+
+		void OnUnloaded(object? sender, RoutedEventArgs args)
+		{
+			VirtualView?.SendDisappearing();
+		}
+
+		void PushExistingNavigationStack()
+		{
+			foreach (var page in VirtualViewWithValidation().Pages)
+			{
+				SetPage(page, false, false);
+			}
+		}
+
+		void SetPage(Page? page, bool isAnimated, bool isPopping)
+		{
+			if (_currentPage != null)
+			{
+				if (isPopping)
+				{
+					_currentPage.Cleanup();
+					NativeViewValidation().TitleView?.Cleanup();
+				}
+
+				NativeViewValidation().Content = null;
+				_currentPage.PropertyChanged -= OnCurrentPagePropertyChanged;
+			}
+
+			if (!isPopping)
+				_previousPage = _currentPage;
+
+			_currentPage = page;
+
+			if (page == null)
+				return;
+
+			UpdateBackButton();
+			UpdateBackButtonTitle();
+
+			page.PropertyChanged += OnCurrentPagePropertyChanged;
+
+			IViewHandler renderer = page.GetOrCreateHandler(this.MauiContext);
+
+			UpdateTitleVisible();
+			UpdateTitleOnParents();
+			UpdateTitleView();
+
+			SetupPageTransition(_transition, isAnimated, isPopping);
+
+			NativeViewValidation().Content = renderer.NativeView;
+			NativeViewValidation().DataContext = page;
+		}
+
+		protected virtual void SetupPageTransition(Transition transition, bool isAnimated, bool isPopping)
+		{
+			PageControl nativeView = NativeViewValidation();
+			if (isAnimated && transition == null)
+			{
+				transition  = new EntranceThemeTransition();
+				_transition = (EntranceThemeTransition)transition;
+				nativeView.ContentTransitions = new TransitionCollection();
+			}
+
+			if (!isAnimated && nativeView.ContentTransitions?.Count > 0)
+			{
+				nativeView.ContentTransitions.Clear();
+			}
+			else if (isAnimated &&
+				nativeView.ContentTransitions != null &&
+				nativeView.ContentTransitions.Contains(transition) == false)
+			{
+				nativeView.ContentTransitions.Clear();
+				nativeView.ContentTransitions.Add(transition);
+			}
+		}
+
+		void UpdateBackButtonTitle()
+		{
+			string title;
+			if (_previousPage != null)
+				title = NavigationPage.GetBackButtonTitle(_previousPage);
+			else
+				title = String.Empty;
+
+			NativeViewValidation().BackButtonTitle = title;
+		}
+
+		void UpdateContainerArea()
+		{
+			VirtualViewWithValidation().ContainerArea = new Rectangle(0, 0, NativeViewValidation().ContentWidth, NativeViewValidation().ContentHeight);
+		}
+
+		void UpdateTitleVisible()
+		{
+			UpdateTitleOnParents();
+
+			bool showing = NativeViewValidation().TitleVisibility == Visibility.Visible;
+			bool newValue = GetIsNavBarPossible() && NavigationPage.GetHasNavigationBar(_currentPage);
+			if (showing == newValue)
+				return;
+
+			NativeViewValidation().TitleVisibility = newValue ? Visibility.Visible : Visibility.Collapsed;
+
+			// Force ContentHeight/Width to update, doesn't work from inside PageControl for some reason
+			NativeViewValidation().UpdateLayout();
+			UpdateContainerArea();
+		}
+
+		void UpdateShowTitle()
+		{
+			((ITitleProvider)this).ShowTitle = _parentTabbedPage == null && _parentFlyoutPage == null;
+		}
+
+		static object GetDefaultColor()
+		{
+			return Microsoft.UI.Xaml.Application.Current.Resources["SystemControlBackgroundChromeMediumLowBrush"];
+		}
+
+		void UpdateBackButton()
+		{
+			if (_currentPage == null)
+			{
+				return;
+			}
+
+			bool showBackButton = VirtualViewWithValidation().InternalChildren.Count > 1 && NavigationPage.GetHasBackButton(_currentPage);
+			if (NativeVersion.IsDesktop)
+			{
+				//TODO MAUI: this means it's running as a desktop app
+			}
+			else
+			{
+				var navManager = SystemNavigationManager.GetForCurrentView();
+				if(navManager != null)
+					navManager.AppViewBackButtonVisibility = showBackButton ? AppViewBackButtonVisibility.Visible : AppViewBackButtonVisibility.Collapsed;
+			}
+
+			NativeView.SetBackButtonTitle(VirtualViewWithValidation());
+		}
+
+		void UpdateTitleOnParents()
+		{
+			if (VirtualView == null || _currentPage == null)
+				return;
+
+			ITitleProvider? render = null;
+			if (_parentTabbedPage != null)
+			{
+				render = _parentTabbedPage.Handler as ITitleProvider;
+				if (render != null)
+					render.ShowTitle = (_parentTabbedPage.CurrentPage == VirtualView) && NavigationPage.GetHasNavigationBar(_currentPage);
+			}
+
+			if (_parentFlyoutPage != null)
+			{
+				render = _parentFlyoutPage.Handler as ITitleProvider;
+				if (render != null)
+					render.ShowTitle = (_parentFlyoutPage.Detail == VirtualView) && NavigationPage.GetHasNavigationBar(_currentPage);
+			}
+
+			if (render != null && render.ShowTitle)
+			{
+				render.Title = _currentPage.Title;
+
+				if (!Brush.IsNullOrEmpty(VirtualView.BarBackground))
+					render.BarBackgroundBrush = GetBarBackgroundBrush(VirtualView);
+				else
+					render.BarBackgroundBrush = GetBarBackgroundColorBrush();
+
+				render.BarForegroundBrush = GetBarForegroundBrush(VirtualView);
+			}
+
+			if (_showTitle || (render != null && render.ShowTitle))
+			{
+				ToolbarManager.UpdateToolbarItems(VirtualView)
+					.FireAndForget((e)=> Log.Warning(nameof(NavigationPage), $"{e}"));
+			}
+		}
+
+		void UpdatePadding()
+		{
+			NativeViewValidation().TitleInset = VirtualViewWithValidation().Padding.Left;
+		}
+
+		void UpdateTitleColor()
+		{
+			(this as ITitleProvider).BarForegroundBrush = GetBarForegroundBrush(VirtualViewWithValidation());
+		}
+
+		void UpdateNavigationBarBackground()
+		{
+			(this as ITitleProvider).BarBackgroundBrush = GetBarBackgroundBrush(VirtualViewWithValidation());
+		}
+
+		void UpdateTitleIcon() =>
+			UpdateTitleIconAsync()
+				.FireAndForget(errorCallback: (e) => Log.Warning(nameof(TitleIcon), $"{e}"));
+
+		async Task UpdateTitleIconAsync()
+		{
+			var page = _currentPage;
+			if (page == null)
+				return;
+
+			ImageSource source = NavigationPage.GetTitleIconImageSource(page);
+
+			TitleIcon = await source.ToWindowsImageSourceAsync();
+
+			if (NativeView == null || _currentPage != page)
+				return;
+
+			NativeView.TitleIcon = TitleIcon;
+
+			if (_parentFlyoutPage != null && this is ITitleIconProvider parent)
+				parent.TitleIcon = TitleIcon;
+
+			NativeView.UpdateLayout();
+			UpdateContainerArea();
+		}
+
+		void UpdateTitleView()
+		{
+			// if the life cycle hasn't reached the point where _parentFlyoutPage gets wired up then 
+			// don't update the title view
+			if (_currentPage == null || !_parentsLookedUp)
+				return;
+
+			// If the container TitleView gets initialized before the FP TitleView it causes the 
+			// FP TitleView to not render correctly
+			if (_parentFlyoutPage != null)
+			{
+				if (this is ITitleViewProvider parent)
+					parent.TitleView = TitleView;
+			}
+			else if (_parentFlyoutPage == null)
+				NativeViewValidation().TitleView = TitleView;
+
+		}
+
+		void UpdateToolbarPlacement()
+		{
+			if (NativeView == null)
+			{
+				return;
+			}
+
+			NativeView.ToolbarPlacement = VirtualView.OnThisPlatform().GetToolbarPlacement();
+		}
+
+		void UpdateToolbarDynamicOverflowEnabled()
+		{
+			if (NativeView == null)
+			{
+				return;
+			}
+
+			NativeView.ToolbarDynamicOverflowEnabled = VirtualView.OnThisPlatform().GetToolbarDynamicOverflowEnabled();
+		}
+
+		public static void MapPadding(NavigationPageHandler handler, NavigationPage view) =>
+			handler.UpdatePadding();
+
+		public static void MapBarTextColor(NavigationPageHandler handler, NavigationPage view) => handler.UpdateTitleColor();
+
+		public static void MapBarBackground(NavigationPageHandler handler, NavigationPage view) => handler.UpdateNavigationBarBackground();
+
+		// TODO MAUI: Task Based Mappers?
+		public static void MapTitleIcon(NavigationPageHandler handler, NavigationPage view) => handler.UpdateTitleIcon();
+
+		public static void MapTitleView(NavigationPageHandler handler, NavigationPage view) => handler.UpdateTitleView();
+
+		public static void MapToolbarPlacement(NavigationPageHandler handler, NavigationPage view) => handler.UpdateToolbarPlacement();
+
+		public static void MapToolbarDynamicOverflowEnabled(NavigationPageHandler handler, NavigationPage view) => handler.UpdateToolbarDynamicOverflowEnabled();
+	}
+}
diff --git a/src/Controls/src/Core/Handlers/NavigationPage/NavigationPageHandler.cs b/src/Controls/src/Core/Handlers/NavigationPage/NavigationPageHandler.cs
new file mode 100644
index 000000000000..952591e22c8e
--- /dev/null
+++ b/src/Controls/src/Core/Handlers/NavigationPage/NavigationPageHandler.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.Maui.Handlers;
+
+#if WINDOWS
+using static Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific.Page;
+#endif
+
+namespace Microsoft.Maui.Controls.Handlers
+{
+	public partial class NavigationPageHandler
+	{
+		public static PropertyMapper<NavigationPage, NavigationPageHandler> NavigationPageMapper
+			   = new PropertyMapper<NavigationPage, NavigationPageHandler>(ViewHandler.ViewMapper)
+			   {
+				   [NavigationPage.BarTextColorProperty.PropertyName] = MapBarTextColor,
+				   [NavigationPage.BarBackgroundColorProperty.PropertyName] = MapBarBackground,
+				   [NavigationPage.BarBackgroundProperty.PropertyName] = MapBarBackground,
+				   [nameof(IPadding.Padding)] = MapPadding,
+				   [nameof(NavigationPage.TitleIconImageSourceProperty.PropertyName)] = MapTitleIcon,
+				   [nameof(NavigationPage.TitleViewProperty.PropertyName)] = MapTitleView,
+
+#if WINDOWS
+					[nameof(ToolbarPlacementProperty.PropertyName)] = MapToolbarPlacement,
+					[nameof(ToolbarDynamicOverflowEnabledProperty.PropertyName)] = MapToolbarDynamicOverflowEnabled,
+#endif
+			   };
+
+		public NavigationPageHandler() : base(NavigationPageMapper)
+		{
+		}
+	}
+}
diff --git a/src/Controls/src/Core/Handlers/NavigationPage/NavigationPageHandler.iOS.cs b/src/Controls/src/Core/Handlers/NavigationPage/NavigationPageHandler.iOS.cs
new file mode 100644
index 000000000000..7bb18867b660
--- /dev/null
+++ b/src/Controls/src/Core/Handlers/NavigationPage/NavigationPageHandler.iOS.cs
@@ -0,0 +1,202 @@
+#nullable enable
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Controls.Platform;
+using Microsoft.Maui.Handlers;
+using UIKit;
+
+namespace Microsoft.Maui.Controls.Handlers
+{
+	public partial class NavigationPageHandler :
+		ViewHandler<NavigationPage, UIView>, INativeViewHandler
+	{
+		ControlsNavigationController _controlsNavigationController;
+		UIViewController? INativeViewHandler.ViewController => _controlsNavigationController;
+
+		protected override UIView CreateNativeView()
+		{
+			_controlsNavigationController = new ControlsNavigationController(this);
+
+			if (_controlsNavigationController.View == null)
+				throw new NullReferenceException("ControlsNavigationController.View is null");
+
+			return _controlsNavigationController.View;
+		}
+
+		public static void MapPadding(NavigationPageHandler handler, NavigationPage view) { }
+
+		public static void MapTitleIcon(NavigationPageHandler handler, NavigationPage view) { }
+
+		public static void MapTitleView(NavigationPageHandler handler, NavigationPage view) { }
+
+		public static void MapBarBackground(NavigationPageHandler handler, NavigationPage view)
+		{
+			var NavPage = handler.VirtualViewWithValidation();
+			var barBackgroundBrush = NavPage.BarBackground;
+
+			if (Brush.IsNullOrEmpty(barBackgroundBrush) &&
+				NavPage.BarBackgroundColor != null)
+				barBackgroundBrush = new SolidColorBrush(NavPage.BarBackgroundColor);
+
+			if (barBackgroundBrush == null)
+				return;
+
+			var navController = handler._controlsNavigationController;
+			var NavigationBar = navController.NavigationBar;
+
+			if (NativeVersion.IsAtLeast(13))
+			{
+				var navigationBarAppearance = NavigationBar.StandardAppearance;
+
+				navigationBarAppearance.ConfigureWithOpaqueBackground();
+
+				//if (barBackgroundColor == null)
+				//{
+				//	navigationBarAppearance.BackgroundColor = ColorExtensions.BackgroundColor;
+
+				//	var parentingViewController = GetParentingViewController();
+				//	parentingViewController?.SetupDefaultNavigationBarAppearance();
+				//}
+				//else
+				//	navigationBarAppearance.BackgroundColor = barBackgroundColor.ToUIColor();
+
+				var backgroundImage = NavigationBar.GetBackgroundImage(barBackgroundBrush);
+				navigationBarAppearance.BackgroundImage = backgroundImage;
+
+				NavigationBar.CompactAppearance = navigationBarAppearance;
+				NavigationBar.StandardAppearance = navigationBarAppearance;
+				NavigationBar.ScrollEdgeAppearance = navigationBarAppearance;
+			}
+			else
+			{
+				var backgroundImage = NavigationBar.GetBackgroundImage(barBackgroundBrush);
+				NavigationBar.SetBackgroundImage(backgroundImage, UIBarMetrics.Default);
+			}
+		}
+
+		public static void MapBarTextColor(NavigationPageHandler handler, NavigationPage view)
+		{
+			var NavPage = handler.VirtualViewWithValidation();
+
+			var navController = handler._controlsNavigationController;
+			var NavigationBar = navController.NavigationBar;
+
+			var barTextColor = NavPage.BarTextColor;
+			if (NavigationBar == null)
+				return;
+
+			// Determine new title text attributes via global static data
+			var globalTitleTextAttributes = UINavigationBar.Appearance.TitleTextAttributes;
+			var titleTextAttributes = new UIStringAttributes
+			{
+				ForegroundColor = barTextColor == null ? globalTitleTextAttributes?.ForegroundColor : barTextColor.ToNative(),
+				Font = globalTitleTextAttributes?.Font
+			};
+
+			// Determine new large title text attributes via global static data
+			var largeTitleTextAttributes = titleTextAttributes;
+			if (NativeVersion.IsAtLeast(11))
+			{
+				var globalLargeTitleTextAttributes = UINavigationBar.Appearance.LargeTitleTextAttributes;
+
+				largeTitleTextAttributes = new UIStringAttributes
+				{
+					ForegroundColor = barTextColor == null ? globalLargeTitleTextAttributes?.ForegroundColor : barTextColor.ToNative(),
+					Font = globalLargeTitleTextAttributes?.Font
+				};
+			}
+
+			if (NativeVersion.IsAtLeast(13))
+			{
+				if (NavigationBar.CompactAppearance != null)
+				{
+					NavigationBar.CompactAppearance.TitleTextAttributes = titleTextAttributes;
+					NavigationBar.CompactAppearance.LargeTitleTextAttributes = largeTitleTextAttributes;
+				}
+
+				NavigationBar.StandardAppearance.TitleTextAttributes = titleTextAttributes;
+				NavigationBar.StandardAppearance.LargeTitleTextAttributes = largeTitleTextAttributes;
+
+				if (NavigationBar.ScrollEdgeAppearance != null)
+				{
+					NavigationBar.ScrollEdgeAppearance.TitleTextAttributes = titleTextAttributes;
+					NavigationBar.ScrollEdgeAppearance.LargeTitleTextAttributes = largeTitleTextAttributes;
+				}
+			}
+			else
+			{
+				NavigationBar.TitleTextAttributes = titleTextAttributes;
+
+				if (NativeVersion.IsAtLeast(11))
+					NavigationBar.LargeTitleTextAttributes = largeTitleTextAttributes;
+			}
+
+			//// set Tint color (i. e. Back Button arrow and Text)
+			//var iconColor = Current != null ? NavigationPage.GetIconColor(Current) : null;
+			//if (iconColor == null)
+			//	iconColor = barTextColor;
+
+			//NavigationBar.TintColor = iconColor == null || NavPage.OnThisPlatform().GetStatusBarTextColorMode() == StatusBarTextColorMode.DoNotAdjust
+			//	? UINavigationBar.Appearance.TintColor
+			//	: iconColor.ToUIColor();
+		}
+
+
+		protected override void ConnectHandler(UIView nativeView)
+		{
+			base.ConnectHandler(nativeView);
+
+			if (VirtualView == null)
+				return;
+
+			VirtualView.PushRequested += OnPushRequested;
+			VirtualView.PopRequested += OnPopRequested;
+			_controlsNavigationController.LoadPages(this.MauiContext);
+
+			//VirtualView.PopToRootRequested += OnPopToRootRequested;
+			//VirtualView.RemovePageRequested += OnRemovedPageRequested;
+			//VirtualView.InsertPageBeforeRequested += OnInsertPageBeforeRequested;
+		}
+
+		protected override void DisconnectHandler(UIView nativeView)
+		{
+			base.DisconnectHandler(nativeView);
+
+			if (VirtualView == null)
+				return;
+
+			VirtualView.PushRequested -= OnPushRequested;
+			VirtualView.PopRequested -= OnPopRequested;
+			//VirtualView.PopToRootRequested -= OnPopToRootRequested;
+			//VirtualView.RemovePageRequested -= OnRemovedPageRequested;
+			//VirtualView.InsertPageBeforeRequested -= OnInsertPageBeforeRequested;
+		}
+
+		void OnPushRequested(object? sender, NavigationRequestedEventArgs e)
+		{
+			_controlsNavigationController?
+				.OnPushRequested(e, this.MauiContext);
+		}
+
+		void OnPopRequested(object? sender, NavigationRequestedEventArgs e)
+		{
+			_controlsNavigationController?
+				.OnPopRequestedAsync(e)
+				.FireAndForget((exc) => Log.Warning(nameof(NavigationPage), $"{exc}"));
+		}
+
+		internal void SendPopping(Task popTask)
+		{
+			if (VirtualView == null)
+				return;
+
+			VirtualView.PopAsyncInner(false, true, true)
+				.FireAndForget((exc) => Log.Warning(nameof(NavigationPage), $"{exc}"));
+		}
+	}
+}
diff --git a/src/Controls/src/Core/IServiceProviderExtensions.cs b/src/Controls/src/Core/IServiceProviderExtensions.cs
deleted file mode 100644
index 106f04b9a19b..000000000000
--- a/src/Controls/src/Core/IServiceProviderExtensions.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-
-namespace Microsoft.Maui.Controls.Xaml
-{
-	public static class IServiceProviderExtensions
-	{
-		public static T GetService<T>(this IServiceProvider provider)
-		{
-			var service = provider.GetService(typeof(T));
-			if (service is T tservice)
-				return tservice;
-			return default(T);
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Controls/src/Core/IStreamImageSource.cs b/src/Controls/src/Core/IStreamImageSource.cs
deleted file mode 100644
index ae3e2a6072fc..000000000000
--- a/src/Controls/src/Core/IStreamImageSource.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Microsoft.Maui.Controls
-{
-	public interface IStreamImageSource
-	{
-		Task<Stream> GetStreamAsync(CancellationToken userToken = default(CancellationToken));
-	}
-}
\ No newline at end of file
diff --git a/src/Controls/src/Core/Image.cs b/src/Controls/src/Core/Image.cs
index 9eb36a1999a4..efeae59ea5ce 100644
--- a/src/Controls/src/Core/Image.cs
+++ b/src/Controls/src/Core/Image.cs
@@ -1,12 +1,9 @@
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Reflection;
-using Microsoft.Maui.Controls.Internals;
 
 namespace Microsoft.Maui.Controls
 {
-	public class Image : View, IImageController, IElementConfiguration<Image>, IViewController, IImageElement
+	public partial class Image : View, IImageController, IElementConfiguration<Image>, IViewController, IImageElement
 	{
 		public static readonly BindableProperty SourceProperty = ImageElement.SourceProperty;
 
@@ -35,7 +32,8 @@ public Aspect Aspect
 
 		public bool IsLoading
 		{
-			get { return (bool)GetValue(IsLoadingProperty); }
+			get => (bool)GetValue(IsLoadingProperty);
+			private set => SetValue(IsLoadingPropertyKey, value);
 		}
 
 		public bool IsOpaque
@@ -57,8 +55,6 @@ public ImageSource Source
 			set { SetValue(SourceProperty, value); }
 		}
 
-		bool IImageController.GetLoadAsAnimation() => ImageElement.GetLoadAsAnimation(this);
-
 		protected override void OnBindingContextChanged()
 		{
 			ImageElement.OnBindingContextChanged(this, this);
@@ -73,20 +69,21 @@ protected override SizeRequest OnSizeRequest(double widthConstraint, double heig
 			return ImageElement.Measure(this, desiredSize, widthConstraint, heightConstraint);
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
-		public void SetIsLoading(bool isLoading)
-		{
-			SetValue(IsLoadingPropertyKey, isLoading);
-		}
-
 		public IPlatformElementConfiguration<T, Image> On<T>() where T : IConfigPlatform
 		{
 			return _platformConfigurationRegistry.Value.On<T>();
 		}
 
+		bool IImageController.GetLoadAsAnimation() =>
+			ImageElement.GetLoadAsAnimation(this);
+
+		void IImageController.SetIsLoading(bool isLoading) =>
+			IsLoading = isLoading;
+
 		void IImageElement.OnImageSourceSourceChanged(object sender, EventArgs e) =>
 			ImageElement.ImageSourceSourceChanged(this, e);
 
-		void IImageElement.RaiseImageSourcePropertyChanged() => OnPropertyChanged(nameof(Source));
+		void IImageElement.RaiseImageSourcePropertyChanged() =>
+			OnPropertyChanged(nameof(Source));
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/src/Core/ImageSource.cs b/src/Controls/src/Core/ImageSource.cs
index dee2c55d1c8c..62ce33abd5f6 100644
--- a/src/Controls/src/Core/ImageSource.cs
+++ b/src/Controls/src/Core/ImageSource.cs
@@ -7,7 +7,7 @@
 namespace Microsoft.Maui.Controls
 {
 	[TypeConverter(typeof(ImageSourceConverter))]
-	public abstract class ImageSource : Element
+	public abstract partial class ImageSource : Element
 	{
 		readonly object _synchandle = new object();
 		CancellationTokenSource _cancellationTokenSource;
@@ -22,7 +22,7 @@ protected ImageSource()
 
 		public virtual bool IsEmpty => false;
 
-		protected CancellationTokenSource CancellationTokenSource
+		private protected CancellationTokenSource CancellationTokenSource
 		{
 			get { return _cancellationTokenSource; }
 			private set
@@ -122,7 +122,7 @@ public static implicit operator ImageSource(Uri uri)
 			return FromUri(uri);
 		}
 
-		protected void OnLoadingCompleted(bool cancelled)
+		private protected void OnLoadingCompleted(bool cancelled)
 		{
 			if (!IsLoading || _completionSource == null)
 				return;
@@ -137,7 +137,7 @@ protected void OnLoadingCompleted(bool cancelled)
 			}
 		}
 
-		protected void OnLoadingStarted()
+		private protected void OnLoadingStarted()
 		{
 			lock (_synchandle)
 			{
diff --git a/src/Controls/src/Core/KnownColor.cs b/src/Controls/src/Core/KnownColor.cs
new file mode 100644
index 000000000000..de6d8826581f
--- /dev/null
+++ b/src/Controls/src/Core/KnownColor.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.Maui.Graphics;
+
+namespace Microsoft.Maui.Controls
+{
+	public static class KnownColor
+	{
+		public static Color Default => null;
+
+		public static Color Transparent { get; } = new(255, 255, 255, 0);
+
+		public static void SetAccent(Color value) => Accent = value;
+
+		public static Color Accent { get; internal set; }
+	}
+}
diff --git a/src/Controls/src/Core/Layout.cs b/src/Controls/src/Core/Layout.cs
index 2f4991c3d544..f8b1bf97a7f3 100644
--- a/src/Controls/src/Core/Layout.cs
+++ b/src/Controls/src/Core/Layout.cs
@@ -219,9 +219,7 @@ protected virtual void OnChildMeasureInvalidated()
 
 		Size IFrameworkElement.Measure(double widthConstraint, double heightConstraint)
 		{
-#pragma warning disable CS0618 // Type or member is obsolete	
-				DesiredSize = OnSizeRequest(widthConstraint, heightConstraint).Request;
-#pragma warning restore CS0618 // Type or member is obsolete	
+			DesiredSize = OnMeasure(widthConstraint, heightConstraint).Request;
 			return DesiredSize;
 		}
 
diff --git a/src/Controls/src/Core/Layout/GridLayout.cs b/src/Controls/src/Core/Layout/GridLayout.cs
index a5c15d71a811..bb2ec6428e6a 100644
--- a/src/Controls/src/Core/Layout/GridLayout.cs
+++ b/src/Controls/src/Core/Layout/GridLayout.cs
@@ -6,8 +6,8 @@ namespace Microsoft.Maui.Controls.Layout2
 {
 	public class GridLayout : Layout, IGridLayout
 	{
-		List<IGridRowDefinition> _rowDefinitions = new List<IGridRowDefinition>();
-		List<IGridColumnDefinition> _columnDefinitions = new List<IGridColumnDefinition>();
+		readonly List<IGridRowDefinition> _rowDefinitions = new();
+		readonly List<IGridColumnDefinition> _columnDefinitions = new();
 
 		public IReadOnlyList<IGridRowDefinition> RowDefinitions => _rowDefinitions;
 		public IReadOnlyList<IGridColumnDefinition> ColumnDefinitions => _columnDefinitions;
@@ -15,48 +15,38 @@ public class GridLayout : Layout, IGridLayout
 		public double RowSpacing { get; set; }
 		public double ColumnSpacing { get; set; }
 
-		Dictionary<IView, GridInfo> _viewInfo = new Dictionary<IView, GridInfo>();
+		readonly Dictionary<IView, GridInfo> _viewInfo = new();
 
-		// TODO ezhart This needs to override Remove and clean up any row/column/span info for the removed child
+		public override void Add(IView child)
+		{
+			base.Add(child);
+			_viewInfo[child] = new GridInfo();
+		}
 
-		public int GetColumn(IView view)
+		public override void Remove(IView child)
 		{
-			if (_viewInfo.TryGetValue(view, out GridInfo gridInfo))
-			{
-				return gridInfo.Col;
-			}
+			_viewInfo.Remove(child);
+			base.Remove(child);
+		}
 
-			return 0;
+		public int GetColumn(IView view)
+		{
+			return _viewInfo[view].Col;
 		}
 
 		public int GetColumnSpan(IView view)
 		{
-			if (_viewInfo.TryGetValue(view, out GridInfo gridInfo))
-			{
-				return gridInfo.ColSpan;
-			}
-
-			return 1;
+			return _viewInfo[view].ColSpan;
 		}
 
 		public int GetRow(IView view)
 		{
-			if (_viewInfo.TryGetValue(view, out GridInfo gridInfo))
-			{
-				return gridInfo.Row;
-			}
-
-			return 0;
+			return _viewInfo[view].Row;
 		}
 
 		public int GetRowSpan(IView view)
 		{
-			if (_viewInfo.TryGetValue(view, out GridInfo gridInfo))
-			{
-				return gridInfo.RowSpan;
-			}
-
-			return 1;
+			return _viewInfo[view].RowSpan;
 		}
 
 		protected override ILayoutManager CreateLayoutManager() => new GridLayoutManager(this);
diff --git a/src/Controls/src/Core/Layout/Layout.cs b/src/Controls/src/Core/Layout/Layout.cs
index dbc29a93c29e..8c4ba373c604 100644
--- a/src/Controls/src/Core/Layout/Layout.cs
+++ b/src/Controls/src/Core/Layout/Layout.cs
@@ -49,7 +49,7 @@ protected override Size ArrangeOverride(Rectangle bounds)
 
 			foreach (var child in Children)
 			{
-				child.Handler?.SetFrame(child.Frame);
+				child.Handler?.NativeArrange(child.Frame);
 			}
 
 			return Frame.Size;
@@ -65,7 +65,7 @@ protected override void InvalidateMeasureOverride()
 			}
 		}
 
-		public void Add(IView child)
+		public virtual void Add(IView child)
 		{
 			if (child == null)
 				return;
@@ -80,7 +80,7 @@ public void Add(IView child)
 			LayoutHandler?.Add(child);
 		}
 
-		public void Remove(IView child)
+		public virtual void Remove(IView child)
 		{
 			if (child == null)
 				return;
diff --git a/src/Core/src/Primitives/NamedSize.cs b/src/Controls/src/Core/NamedSize.cs
similarity index 83%
rename from src/Core/src/Primitives/NamedSize.cs
rename to src/Controls/src/Core/NamedSize.cs
index f7f4eafa10a1..5f37c1e34af2 100644
--- a/src/Core/src/Primitives/NamedSize.cs
+++ b/src/Controls/src/Core/NamedSize.cs
@@ -1,4 +1,4 @@
-namespace Microsoft.Maui
+namespace Microsoft.Maui.Controls
 {
 	public enum NamedSize
 	{
diff --git a/src/Controls/src/Core/NavigationPage.cs b/src/Controls/src/Core/NavigationPage.cs
index 6d6d8eda2e9b..8eaf24b59b03 100644
--- a/src/Controls/src/Core/NavigationPage.cs
+++ b/src/Controls/src/Core/NavigationPage.cs
@@ -8,7 +8,7 @@
 
 namespace Microsoft.Maui.Controls
 {
-	public class NavigationPage : Page, IPageContainer<Page>, IBarElement, INavigationPageController, IElementConfiguration<NavigationPage>
+	public partial class NavigationPage : Page, IPageContainer<Page>, IBarElement, INavigationPageController, IElementConfiguration<NavigationPage>
 	{
 		public static readonly BindableProperty BackButtonTitleProperty = BindableProperty.CreateAttached("BackButtonTitle", typeof(string), typeof(Page), null);
 
@@ -35,6 +35,8 @@ public class NavigationPage : Page, IPageContainer<Page>, IBarElement, INavigati
 		static readonly BindablePropertyKey RootPagePropertyKey = BindableProperty.CreateReadOnly(nameof(RootPage), typeof(Page), typeof(NavigationPage), null);
 		public static readonly BindableProperty RootPageProperty = RootPagePropertyKey.BindableProperty;
 
+		INavigationPageController NavigationPageController => this;
+
 		public NavigationPage()
 		{
 			_platformConfigurationRegistry = new Lazy<PlatformConfigurationRegistry<NavigationPage>>(() => new PlatformConfigurationRegistry<NavigationPage>(this));
@@ -86,8 +88,7 @@ public Page Peek(int depth)
 		[EditorBrowsable(EditorBrowsableState.Never)]
 		public IEnumerable<Page> Pages => InternalChildren.Cast<Page>();
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
-		public int StackDepth
+		int INavigationPageController.StackDepth
 		{
 			get { return InternalChildren.Count; }
 		}
@@ -176,7 +177,7 @@ public async Task<Page> PopAsync(bool animated)
 				else
 					CurrentNavigationTask = tcs.Task;
 
-				var result = await PopAsyncInner(animated, false);
+				var result = await (this as INavigationPageController).PopAsyncInner(animated, false);
 				tcs.SetResult(true);
 				return result;
 			}
@@ -279,7 +280,7 @@ protected override bool OnBackButtonPressed()
 			if (CurrentPage.SendBackButtonPressed())
 				return true;
 
-			if (StackDepth > 1)
+			if (NavigationPageController.StackDepth > 1)
 			{
 				SafePop();
 				return true;
@@ -288,35 +289,50 @@ protected override bool OnBackButtonPressed()
 			return base.OnBackButtonPressed();
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
-		public event EventHandler<NavigationRequestedEventArgs> InsertPageBeforeRequested;
+		EventHandler<NavigationRequestedEventArgs> _insertPageBeforeRequested;
+		event EventHandler<NavigationRequestedEventArgs> INavigationPageController.InsertPageBeforeRequested
+		{
+			add => _insertPageBeforeRequested += value;
+			remove => _insertPageBeforeRequested -= value;
+		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
-		public async Task<Page> PopAsyncInner(bool animated, bool fast)
+
+		internal async Task<Page> PopAsyncInner(
+			bool animated,
+			bool fast,
+			bool requestedFromHandler)
 		{
-			if (StackDepth == 1)
+			if (NavigationPageController.StackDepth == 1)
 			{
 				return null;
 			}
 
 			var page = (Page)InternalChildren.Last();
-
-			return await (this as INavigationPageController).RemoveAsyncInner(page, animated, fast);
+			return await RemoveAsyncInner(page, animated, fast, requestedFromHandler);
 		}
 
-		async Task<Page> INavigationPageController.RemoveAsyncInner(Page page, bool animated, bool fast)
+		internal async Task<Page> RemoveAsyncInner(
+			Page page,
+			bool animated,
+			bool fast,
+			bool requestedFromHandler)
 		{
-			if (StackDepth == 1)
+			if (NavigationPageController.StackDepth == 1)
 			{
 				return null;
 			}
 
+			FireDisappearing(page);
+
+			if (InternalChildren.Last() == page)
+				FireAppearing((Page)InternalChildren[NavigationPageController.StackDepth - 2]);
+
 			var args = new NavigationRequestedEventArgs(page, animated);
 
 			var removed = true;
 
 			EventHandler<NavigationRequestedEventArgs> requestPop = PopRequested;
-			if (requestPop != null)
+			if (requestPop != null && !requestedFromHandler)
 			{
 				requestPop(this, args);
 
@@ -337,6 +353,16 @@ async Task<Page> INavigationPageController.RemoveAsyncInner(Page page, bool anim
 			return page;
 		}
 
+		Task<Page> INavigationPageController.PopAsyncInner(bool animated, bool fast)
+		{
+			return PopAsyncInner(animated, fast, false);
+		}
+
+		Task<Page> INavigationPageController.RemoveAsyncInner(Page page, bool animated, bool fast)
+		{
+			return RemoveAsyncInner(page, animated, fast, false);
+		}
+
 		[EditorBrowsable(EditorBrowsableState.Never)]
 		public event EventHandler<NavigationRequestedEventArgs> PopRequested;
 
@@ -363,8 +389,7 @@ void InsertPageBefore(Page page, Page before)
 			if (InternalChildren.Contains(page))
 				throw new ArgumentException("Cannot insert page which is already in the navigation stack");
 
-			EventHandler<NavigationRequestedEventArgs> handler = InsertPageBeforeRequested;
-			handler?.Invoke(this, new NavigationRequestedEventArgs(page, before, false));
+			_insertPageBeforeRequested?.Invoke(this, new NavigationRequestedEventArgs(page, before, false));
 
 			int index = InternalChildren.IndexOf(before);
 			InternalChildren.Insert(index, page);
@@ -379,9 +404,12 @@ void InsertPageBefore(Page page, Page before)
 
 		async Task PopToRootAsyncInner(bool animated)
 		{
-			if (StackDepth == 1)
+			if (NavigationPageController.StackDepth == 1)
 				return;
 
+			FireDisappearing(CurrentPage);
+			FireAppearing((Page)InternalChildren[0]);
+
 			Element[] childrenToRemove = InternalChildren.Skip(1).ToArray();
 			foreach (Element child in childrenToRemove)
 				InternalChildren.Remove(child);
@@ -402,11 +430,26 @@ async Task PopToRootAsyncInner(bool animated)
 			PoppedToRoot?.Invoke(this, new PoppedToRootEventArgs(RootPage, childrenToRemove.OfType<Page>().ToList()));
 		}
 
+		void FireDisappearing(Page page)
+		{
+			if (HasAppeared)
+				page?.SendDisappearing();
+		}
+
+		void FireAppearing(Page page)
+		{
+			if (HasAppeared)
+				page?.SendAppearing();
+		}
+
 		async Task PushAsyncInner(Page page, bool animated)
 		{
 			if (InternalChildren.Contains(page))
 				return;
 
+			FireDisappearing(CurrentPage);
+			FireAppearing(page);
+
 			PushPage(page);
 
 			var args = new NavigationRequestedEventArgs(page, animated);
diff --git a/src/Controls/src/Core/Page.cs b/src/Controls/src/Core/Page.cs
index 28ed357da7dc..1ad1c96de046 100644
--- a/src/Controls/src/Core/Page.cs
+++ b/src/Controls/src/Core/Page.cs
@@ -11,7 +11,7 @@
 
 namespace Microsoft.Maui.Controls
 {
-	public class Page : VisualElement, ILayout, IPageController, IElementConfiguration<Page>, IPaddingElement
+	public partial class Page : VisualElement, ILayout, IPageController, IElementConfiguration<Page>, IPaddingElement
 	{
 		public const string BusySetSignalName = "Microsoft.Maui.Controls.BusySet";
 
@@ -41,6 +41,7 @@ public class Page : VisualElement, ILayout, IPageController, IElementConfigurati
 		bool _containerAreaSet;
 
 		bool _hasAppeared;
+		private protected bool HasAppeared => _hasAppeared;
 
 		ReadOnlyCollection<Element> _logicalChildren;
 
@@ -311,7 +312,7 @@ protected virtual void OnDisappearing()
 
 		protected override void OnParentSet()
 		{
-			if (!Application.IsApplicationOrNull(RealParent) && !(RealParent is Page) && !(RealParent is BaseShellItem))
+			if (!Application.IsApplicationOrNull(RealParent) && !(RealParent is Page) && !(RealParent is BaseShellItem) && !(RealParent is IWindow))
 				throw new InvalidOperationException("Parent of a Page must also be a Page");
 			base.OnParentSet();
 		}
diff --git a/src/Controls/src/Core/Picker.cs b/src/Controls/src/Core/Picker.cs
index 4c12daff53a1..f6a712ffd3e4 100644
--- a/src/Controls/src/Core/Picker.cs
+++ b/src/Controls/src/Core/Picker.cs
@@ -212,6 +212,8 @@ void OnItemsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
 			// If the index has not changed, still need to change the selected item
 			if (newIndex == oldIndex)
 				UpdateSelectedItem(newIndex);
+			//This sends the notification to the Maui Handler to reload
+			OnPropertyChanged("Reload");
 		}
 
 		static void OnItemsSourceChanged(BindableObject bindable, object oldValue, object newValue)
diff --git a/src/Compatibility/Core/src/Android/Extensions/BrushExtensions.cs b/src/Controls/src/Core/Platform/Android/Extensions/BrushExtensions.cs
similarity index 93%
rename from src/Compatibility/Core/src/Android/Extensions/BrushExtensions.cs
rename to src/Controls/src/Core/Platform/Android/Extensions/BrushExtensions.cs
index ff1f060a835c..1af795e92a19 100644
--- a/src/Compatibility/Core/src/Android/Extensions/BrushExtensions.cs
+++ b/src/Controls/src/Core/Platform/Android/Extensions/BrushExtensions.cs
@@ -8,7 +8,7 @@
 using Color = Microsoft.Maui.Graphics.Color;
 using Paint = Android.Graphics.Paint;
 
-namespace Microsoft.Maui.Controls.Compatibility.Platform.Android
+namespace Microsoft.Maui.Controls.Platform
 {
 	public static class BrushExtensions
 	{
@@ -53,7 +53,7 @@ public static void UpdateBackground(this Paint paint, Brush brush, int height, i
 			if (brush is SolidColorBrush solidColorBrush)
 			{
 				var backgroundColor = solidColorBrush.Color;
-				paint.Color = backgroundColor.ToAndroid();
+				paint.Color = backgroundColor.ToNative();
 			}
 
 			if (brush is LinearGradientBrush linearGradientBrush)
@@ -119,7 +119,7 @@ public static void UpdateBackground(this GradientDrawable gradientDrawable, Brus
 			if (brush is SolidColorBrush solidColorBrush)
 			{
 				Color bgColor = solidColorBrush.Color;
-				gradientDrawable.SetColor(bgColor?.ToAndroid() ?? Colors.Transparent.ToAndroid());
+				gradientDrawable.SetColor(bgColor?.ToNative() ?? Colors.Transparent.ToNative());
 			}
 
 			if (brush is LinearGradientBrush linearGradientBrush)
@@ -175,7 +175,7 @@ public static void UpdateBackground(this GradientDrawable gradientDrawable, Brus
 
 		public static bool UseGradients(this GradientDrawable gradientDrawable)
 		{
-			if (!Forms.IsNougatOrNewer)
+			if (!NativeVersion.IsAtLeast(24))
 				return false;
 
 			var colors = gradientDrawable.GetColors();
@@ -197,11 +197,11 @@ internal static void SetPaintGradient(this AView view, Brush brush)
 				Shape = new RectShape()
 			};
 
-			gradientStrokeDrawable.SetStroke(0, Colors.Transparent.ToAndroid());
+			gradientStrokeDrawable.SetStroke(0, Colors.Transparent.ToNative());
 
 			if (brush is SolidColorBrush solidColorBrush)
 			{
-				var color = solidColorBrush.Color?.ToAndroid() ?? Colors.Transparent.ToAndroid();
+				var color = solidColorBrush.Color?.ToNative() ?? Colors.Transparent.ToNative();
 				gradientStrokeDrawable.SetColor(color);
 			}
 			else
@@ -256,7 +256,7 @@ internal static Tuple<int[], float[]> GetGradientBrushData(this GradientBrush gr
 			int count = 0;
 			foreach (var orderStop in orderStops)
 			{
-				colors[count] = orderStop.Color.ToAndroid().ToArgb();
+				colors[count] = orderStop.Color.ToNative().ToArgb();
 				offsets[count] = orderStop.Offset;
 				count++;
 			}
diff --git a/src/Compatibility/Core/src/Android/GradientStrokeDrawable.cs b/src/Controls/src/Core/Platform/Android/GradientStrokeDrawable.cs
similarity index 98%
rename from src/Compatibility/Core/src/Android/GradientStrokeDrawable.cs
rename to src/Controls/src/Core/Platform/Android/GradientStrokeDrawable.cs
index c5de19939ca2..a1ab79472496 100644
--- a/src/Compatibility/Core/src/Android/GradientStrokeDrawable.cs
+++ b/src/Controls/src/Core/Platform/Android/GradientStrokeDrawable.cs
@@ -4,7 +4,7 @@
 using Android.Graphics.Drawables.Shapes;
 using AColor = Android.Graphics.Color;
 
-namespace Microsoft.Maui.Controls.Compatibility.Platform.Android
+namespace Microsoft.Maui.Controls.Platform
 {
 	public class GradientStrokeDrawable : PaintDrawable
 	{
diff --git a/src/Controls/src/Core/Platform/Android/ILifeCycleState.cs b/src/Controls/src/Core/Platform/Android/ILifeCycleState.cs
new file mode 100644
index 000000000000..9a846d421b34
--- /dev/null
+++ b/src/Controls/src/Core/Platform/Android/ILifeCycleState.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using Android.App;
+using Android.Content;
+using Android.OS;
+using Android.Runtime;
+using Android.Views;
+using Android.Widget;
+
+namespace Microsoft.Maui.Controls.Platform
+{
+	internal interface ILifeCycleState
+	{
+		bool MarkedForDispose { get; set; }
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/src/Core/Platform/Android/MauiFragmentNavDestination.cs b/src/Controls/src/Core/Platform/Android/MauiFragmentNavDestination.cs
new file mode 100644
index 000000000000..a8bde1bc8182
--- /dev/null
+++ b/src/Controls/src/Core/Platform/Android/MauiFragmentNavDestination.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using AndroidX.Navigation;
+using AndroidX.Navigation.Fragment;
+using Microsoft.Maui.Controls.Handlers;
+
+namespace Microsoft.Maui.Controls.Platform
+{
+	class MauiFragmentNavDestination : FragmentNavigator.Destination
+	{
+		public IPage Page { get; }
+		public IMauiContext MauiContext => NavigationPageHandler.MauiContext;
+		public NavigationPageHandler NavigationPageHandler { get; }
+
+		// Todo we want to generate the same ids for each page so if the app is recreated
+		// we want these to match up
+		static Dictionary<IPage, int> Pages = new Dictionary<IPage, int>();
+
+		public MauiFragmentNavDestination(Navigator fragmentNavigator, IPage page, NavigationPageHandler navigationPageHandler) : base(fragmentNavigator)
+		{
+			_ = page ?? throw new ArgumentNullException(nameof(page));
+			_ = navigationPageHandler ?? throw new ArgumentNullException(nameof(navigationPageHandler));
+			SetClassName(Java.Lang.Class.FromType(typeof(NavHostPageFragment)).CanonicalName);
+
+			if (!Pages.ContainsKey(page))
+			{
+				Id = global::Android.Views.View.GenerateViewId();
+				Pages.Add(page, Id);
+			}
+
+			Id = Pages[page];
+			this.Page = page;
+			this.NavigationPageHandler = navigationPageHandler;
+		}
+
+		public static MauiFragmentNavDestination AddDestination(
+			IPage page,
+			NavigationPageHandler navigationPageHandler,
+			NavGraph navGraph,
+			FragmentNavigator navigator)
+		{
+			var destination = new MauiFragmentNavDestination(navigator, page, navigationPageHandler);
+
+			navGraph.AddDestination(destination);
+			return destination;
+		}
+	}
+}
diff --git a/src/Controls/src/Core/Platform/Android/NavHostPageFragment.cs b/src/Controls/src/Core/Platform/Android/NavHostPageFragment.cs
new file mode 100644
index 000000000000..c2e066f9de8c
--- /dev/null
+++ b/src/Controls/src/Core/Platform/Android/NavHostPageFragment.cs
@@ -0,0 +1,170 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Android.Content.Res;
+using Android.Graphics;
+using Android.OS;
+using Android.Runtime;
+using Android.Views;
+using AndroidX.AppCompat.App;
+using AndroidX.AppCompat.Widget;
+using AndroidX.CoordinatorLayout.Widget;
+using AndroidX.Fragment.App;
+using AndroidX.Navigation.Fragment;
+using AndroidX.Navigation.UI;
+using Microsoft.Maui.Controls.Handlers;
+using AView = Android.Views.View;
+
+namespace Microsoft.Maui.Controls.Platform
+{
+	class NavHostPageFragment : Fragment
+	{
+		ProcessBackClick BackClick { get; }
+
+		NavHostFragment NavHost =>
+			   (NavHostFragment)
+				   Context
+					   .GetFragmentManager()
+					   .FindFragmentById(Resource.Id.nav_host);
+
+		MauiFragmentNavDestination NavDestination { get; set; }
+
+		protected NavHostPageFragment(IntPtr javaReference, JniHandleOwnership transfer) : base(javaReference, transfer)
+		{
+			BackClick = new ProcessBackClick(this);
+		}
+
+		public NavHostPageFragment()
+		{
+			BackClick = new ProcessBackClick(this);
+		}
+
+		public override AView OnCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
+		{
+			if (NavDestination == null)
+			{
+				NavDestination =
+					(MauiFragmentNavDestination)
+						NavHost.NavController.CurrentDestination;
+			}
+
+			_ = NavDestination ?? throw new ArgumentNullException(nameof(NavDestination));
+
+			var view = NavDestination.Page.ToNative(NavDestination.MauiContext);
+			return view;
+		}
+
+		public override void OnViewCreated(AView view, Bundle savedInstanceState)
+		{
+			base.OnViewCreated(view, savedInstanceState);
+
+			var controller = NavHostFragment.FindNavController(this);
+			var appbarConfig =
+				new AppBarConfiguration
+					.Builder(controller.Graph)
+					.Build();
+
+			NavigationUI
+				.SetupWithNavController(NavDestination.NavigationPageHandler.Toolbar, controller, appbarConfig);
+
+			HasOptionsMenu = true;
+
+			NavDestination.NavigationPageHandler.Toolbar.SetNavigationOnClickListener(BackClick);
+
+			UpdateToolbar();
+			NavDestination.NavigationPageHandler.Toolbar
+				.Title = NavDestination.Page.Title;
+
+			if (Context.GetActivity() is AppCompatActivity aca)
+			{
+				aca.SupportActionBar.Title = NavDestination.Page.Title;
+
+				// TODO MAUI put this elsewhere once we figure out how attached property handlers work
+				bool showNavBar = false;
+				if (NavDestination.Page is BindableObject bo)
+					showNavBar = NavigationPage.GetHasNavigationBar(bo);
+
+				var appBar = NavDestination.NavigationPageHandler.AppBar;
+				if (!showNavBar)
+				{
+					if (appBar.LayoutParameters is CoordinatorLayout.LayoutParams cl)
+					{
+						cl.Height = 0;
+						appBar.LayoutParameters = cl;
+					}
+				}
+				else
+				{
+					if (appBar.LayoutParameters is CoordinatorLayout.LayoutParams cl)
+					{
+						cl.Height = ActionBarHeight();
+						appBar.LayoutParameters = cl;
+					}
+				}
+			}
+
+
+			int ActionBarHeight()
+			{
+				int attr = Resource.Attribute.actionBarSize;
+
+				int actionBarHeight = (int)Context.GetThemeAttributePixels(Resource.Attribute.actionBarSize);
+
+				//if (actionBarHeight <= 0)
+				//	return Device.Info.CurrentOrientation.IsPortrait() ? (int)Context.ToPixels(56) : (int)Context.ToPixels(48);
+
+				//if (Context.GetActivity().Window.Attributes.Flags.HasFlag(WindowManagerFlags.TranslucentStatus) || Context.GetActivity().Window.Attributes.Flags.HasFlag(WindowManagerFlags.TranslucentNavigation))
+				//{
+				//	if (_toolbar.PaddingTop == 0)
+				//		_toolbar.SetPadding(0, GetStatusBarHeight(), 0, 0);
+
+				//	return actionBarHeight + GetStatusBarHeight();
+				//}
+
+				return actionBarHeight;
+			}
+
+		}
+
+		public override void OnCreate(Bundle savedInstanceState)
+		{
+			base.OnCreate(savedInstanceState);
+			RequireActivity()
+				.OnBackPressedDispatcher
+				.AddCallback(this, BackClick);
+		}
+
+		public void HandleOnBackPressed()
+		{
+			NavDestination.NavigationPageHandler.OnPop();
+		}
+
+		// TODO Move somewhere else
+		void UpdateToolbar()
+		{
+
+		}
+
+
+		class ProcessBackClick : AndroidX.Activity.OnBackPressedCallback, AView.IOnClickListener
+		{
+			NavHostPageFragment _navHostPageFragment;
+
+			public ProcessBackClick(NavHostPageFragment navHostPageFragment)
+				: base(true)
+			{
+				_navHostPageFragment = navHostPageFragment;
+			}
+
+			public override void HandleOnBackPressed()
+			{
+				_navHostPageFragment.HandleOnBackPressed();
+			}
+
+			public void OnClick(AView v)
+			{
+				HandleOnBackPressed();
+			}
+		}
+	}
+}
diff --git a/src/Controls/src/Core/Platform/Android/ViewExtensions.cs b/src/Controls/src/Core/Platform/Android/ViewExtensions.cs
new file mode 100644
index 000000000000..5691a0ba57d7
--- /dev/null
+++ b/src/Controls/src/Core/Platform/Android/ViewExtensions.cs
@@ -0,0 +1,152 @@
+using System.Collections.Generic;
+using System.Linq;
+using Android.Content;
+using Android.Graphics.Drawables;
+using Android.OS;
+using Android.Util;
+using Android.Views;
+using AndroidX.Core.Content;
+using Microsoft.Maui.Handlers;
+using AColor = Android.Graphics.Color;
+using ARect = Android.Graphics.Rect;
+using AView = Android.Views.View;
+
+namespace Microsoft.Maui.Controls.Platform
+{
+	public static class ViewExtensions
+	{
+		public static void RemoveFromParent(this AView view)
+		{
+			if (view == null)
+				return;
+			if (view.Parent == null)
+				return;
+			((ViewGroup)view.Parent).RemoveView(view);
+		}
+
+		public static void SetBackground(this AView view, Drawable drawable)
+		{
+
+			view.Background = drawable;
+
+		}
+
+		public static void SetWindowBackground(this AView view)
+		{
+			Context context = view.Context;
+			using (var background = new TypedValue())
+			{
+				if (context.Theme.ResolveAttribute(global::Android.Resource.Attribute.WindowBackground, background, true))
+				{
+					string type = context.Resources.GetResourceTypeName(background.ResourceId).ToLower();
+					switch (type)
+					{
+						case "color":
+							var color = new AColor(ContextCompat.GetColor(context, background.ResourceId));
+							view.SetBackgroundColor(color);
+							break;
+						case "drawable":
+							using (Drawable drawable = ContextCompat.GetDrawable(context, background.ResourceId))
+								view.SetBackground(drawable);
+							break;
+					}
+				}
+			}
+		}
+
+		public static void EnsureId(this AView view)
+		{
+			if (!view.IsAlive())
+			{
+				return;
+			}
+
+			if (view.Id == AView.NoId)
+			{
+				view.Id = global::Android.Views.View.GenerateViewId();
+			}
+		}
+
+		public static bool GetClipToOutline(this AView view)
+		{
+			if (!view.IsAlive())
+				return false;
+
+			return view.ClipToOutline;
+		}
+
+		public static void SetClipToOutline(this AView view, bool value)
+		{
+			if (!view.IsAlive())
+				return;
+
+			view.ClipToOutline = value;
+		}
+
+		public static bool SetElevation(this AView view, float value)
+		{
+			if (!view.IsAlive())
+				return false;
+
+			view.Elevation = value;
+			return true;
+		}
+
+		internal static void MaybeRequestLayout(this AView view)
+		{
+			var isInLayout = false;
+			if ((int)Build.VERSION.SdkInt >= 18)
+				isInLayout = view.IsInLayout;
+
+			if (!isInLayout && !view.IsLayoutRequested)
+				view.RequestLayout();
+		}
+
+		internal static T GetParentOfType<T>(this IViewParent view)
+			where T : class
+		{
+			if (view is T t)
+				return t;
+
+			while (view != null)
+			{
+				T parent = view.Parent as T;
+				if (parent != null)
+					return parent;
+
+				view = view.Parent;
+			}
+
+			return default(T);
+		}
+
+		internal static T GetParentOfType<T>(this AView view)
+			where T : class
+		{
+			T t = view as T;
+			if (view != null)
+				return t;
+
+			return view.Parent.GetParentOfType<T>();
+		}
+
+		internal static T FindParentOfType<T>(this VisualElement element)
+		{
+			var navPage = element.GetParentsPath()
+				.OfType<T>()
+				.FirstOrDefault();
+			return navPage;
+		}
+
+		internal static IEnumerable<Element> GetParentsPath(this VisualElement self)
+		{
+			Element current = self;
+
+			while (!Application.IsApplicationOrNull(current.RealParent))
+			{
+				current = current.RealParent;
+				yield return current;
+			}
+		}
+	}
+}
diff --git a/src/Controls/src/Core/Platform/Windows/BackgroundTracker.cs b/src/Controls/src/Core/Platform/Windows/BackgroundTracker.cs
new file mode 100644
index 000000000000..d5f9ca68e7ef
--- /dev/null
+++ b/src/Controls/src/Core/Platform/Windows/BackgroundTracker.cs
@@ -0,0 +1,81 @@
+using System;
+using System.ComponentModel;
+using Microsoft.Maui.Graphics;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Media.Imaging;
+
+namespace Microsoft.Maui.Controls.Platform
+{
+	internal sealed class BackgroundTracker<T> : VisualElementTracker<Page, T> where T : FrameworkElement
+	{
+		readonly DependencyProperty _backgroundProperty;
+		bool _backgroundNeedsUpdate = true;
+
+		public BackgroundTracker(DependencyProperty backgroundProperty)
+		{
+			if (backgroundProperty == null)
+				throw new ArgumentNullException("backgroundProperty");
+
+			_backgroundProperty = backgroundProperty;
+		}
+
+		protected override void OnPropertyChanged(object sender, PropertyChangedEventArgs e)
+		{
+			if (e.IsOneOf(VisualElement.BackgroundColorProperty, VisualElement.BackgroundProperty, Page.BackgroundImageSourceProperty))
+			{
+				UpdateBackground();
+			}
+
+			base.OnPropertyChanged(sender, e);
+		}
+
+		protected override void UpdateNativeControl()
+		{
+			base.UpdateNativeControl();
+
+			if (_backgroundNeedsUpdate)
+				UpdateBackground();
+		}
+
+		async void UpdateBackground()
+		{
+			if (Element == null)
+				return;
+
+			FrameworkElement element = Control ?? Container;
+			if (element == null)
+				return;
+
+			var backgroundImage = await Element.BackgroundImageSource.ToWindowsImageSourceAsync();
+
+			if (backgroundImage != null)
+			{
+				element.SetValue(_backgroundProperty, new ImageBrush { ImageSource = backgroundImage });
+			}
+			else
+			{
+				if (!Element.Background.IsEmpty)
+				{
+					element.SetValue(_backgroundProperty, Element.Background.ToBrush());
+				}
+				else
+				{
+					Color backgroundColor = Element.BackgroundColor;
+					if (!backgroundColor.IsDefault())
+					{
+						element.SetValue(_backgroundProperty, backgroundColor.ToNative());
+					}
+					else
+					{
+						object localBackground = element.ReadLocalValue(_backgroundProperty);
+						if (localBackground != null && localBackground != DependencyProperty.UnsetValue)
+							element.ClearValue(_backgroundProperty);
+					}
+				}
+			}
+
+			_backgroundNeedsUpdate = false;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/src/Core/Platform/Windows/CompositionHelper.cs b/src/Controls/src/Core/Platform/Windows/CompositionHelper.cs
new file mode 100644
index 000000000000..583fa3fc770f
--- /dev/null
+++ b/src/Controls/src/Core/Platform/Windows/CompositionHelper.cs
@@ -0,0 +1,32 @@
+#nullable enable
+using System;
+using System.Linq;
+using System.Reflection;
+using Windows.UI.Composition;
+
+namespace Microsoft.Maui.Controls.Platform
+{
+	static class CompositionHelper
+	{
+		static bool SetTypePresent;
+		static bool IsTypePresent;
+
+		public static bool IsCompositionGeometryTypePresent
+		{
+			get
+			{
+				if (!SetTypePresent)
+				{
+					var compositorMethods = typeof(Compositor).GetMethods();
+					var createGeometricClipExists = compositorMethods.Any(m => m.Name == "CreateGeometricClip");
+					var createEllipseGeometryExists = compositorMethods.Any(m => m.Name == "CreateEllipseGeometry");
+
+					IsTypePresent = createGeometricClipExists && createEllipseGeometryExists;
+					SetTypePresent = true;
+				}
+
+				return IsTypePresent;
+			}
+		}
+	}
+}
diff --git a/src/Controls/src/Core/Platform/Windows/Extensions/AccessibilityExtensions.cs b/src/Controls/src/Core/Platform/Windows/Extensions/AccessibilityExtensions.cs
new file mode 100644
index 000000000000..a1c23145dac4
--- /dev/null
+++ b/src/Controls/src/Core/Platform/Windows/Extensions/AccessibilityExtensions.cs
@@ -0,0 +1,148 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Automation.Peers;
+using NativeAutomationProperties = Microsoft.UI.Xaml.Automation.AutomationProperties;
+
+namespace Microsoft.Maui.Controls.Platform
+{
+	public static class AccessibilityExtensions
+	{
+		public static void SetAutomationPropertiesAutomationId(this FrameworkElement Control, string id)
+		{
+			Control.SetValue(NativeAutomationProperties.AutomationIdProperty, id);
+		}
+
+		public static string SetAutomationPropertiesName(this FrameworkElement Control, Element Element, string _defaultAutomationPropertiesName = null)
+		{
+			if (Element == null)
+				return _defaultAutomationPropertiesName;
+
+			if (_defaultAutomationPropertiesName == null)
+				_defaultAutomationPropertiesName = (string)Control.GetValue(NativeAutomationProperties.NameProperty);
+
+			var elemValue = (string)Element.GetValue(AutomationProperties.NameProperty);
+
+			if (!string.IsNullOrWhiteSpace(elemValue))
+				Control.SetValue(NativeAutomationProperties.NameProperty, elemValue);
+			else
+				Control.SetValue(NativeAutomationProperties.NameProperty, _defaultAutomationPropertiesName);
+
+			return _defaultAutomationPropertiesName;
+		}
+
+		public static AccessibilityView? SetAutomationPropertiesAccessibilityView(this FrameworkElement Control, Element Element, AccessibilityView? _defaultAutomationPropertiesAccessibilityView = null)
+		{
+			if (Element == null)
+				return _defaultAutomationPropertiesAccessibilityView;
+
+			if (!_defaultAutomationPropertiesAccessibilityView.HasValue)
+				_defaultAutomationPropertiesAccessibilityView = (AccessibilityView)Control.GetValue(NativeAutomationProperties.AccessibilityViewProperty);
+
+			var newValue = _defaultAutomationPropertiesAccessibilityView;
+
+			var elemValue = (bool?)Element.GetValue(AutomationProperties.IsInAccessibleTreeProperty);
+
+			if (elemValue == true)
+				newValue = AccessibilityView.Content;
+			else if (elemValue == false)
+				newValue = AccessibilityView.Raw;
+
+			Control.SetValue(NativeAutomationProperties.AccessibilityViewProperty, newValue);
+
+			return _defaultAutomationPropertiesAccessibilityView;
+
+		}
+		public static string SetAutomationPropertiesHelpText(this FrameworkElement Control, Element Element, string _defaultAutomationPropertiesHelpText = null)
+		{
+			if (Element == null)
+				return _defaultAutomationPropertiesHelpText;
+
+			if (_defaultAutomationPropertiesHelpText == null)
+				_defaultAutomationPropertiesHelpText = (string)Control.GetValue(NativeAutomationProperties.HelpTextProperty);
+
+			var elemValue = (string)Element.GetValue(AutomationProperties.HelpTextProperty);
+
+			if (!string.IsNullOrWhiteSpace(elemValue))
+				Control.SetValue(NativeAutomationProperties.HelpTextProperty, elemValue);
+			else
+				Control.SetValue(NativeAutomationProperties.HelpTextProperty, _defaultAutomationPropertiesHelpText);
+
+			return _defaultAutomationPropertiesHelpText;
+		}
+
+		public static UIElement SetAutomationPropertiesLabeledBy(
+			this FrameworkElement Control, 
+			Element Element,
+			IMauiContext mauiContext,
+			UIElement _defaultAutomationPropertiesLabeledBy = null)
+		{
+			if (Element == null)
+				return _defaultAutomationPropertiesLabeledBy;
+
+			// TODO Maui: this is a bit of a hack because Elements
+			// currently don't implement IFrameworkElement but they should
+			mauiContext ??= (Element as IFrameworkElement)?.Handler?.MauiContext;
+
+			if (_defaultAutomationPropertiesLabeledBy == null)
+				_defaultAutomationPropertiesLabeledBy = (UIElement)Control.GetValue(NativeAutomationProperties.LabeledByProperty);
+
+			var elemValue = (VisualElement)Element.GetValue(AutomationProperties.LabeledByProperty);
+
+			FrameworkElement nativeElement = null;
+
+			if(mauiContext != null)
+				nativeElement = (elemValue as IView)?.GetOrCreateHandler(mauiContext)?.NativeView as FrameworkElement;
+
+			if (nativeElement != null)
+				Control.SetValue(AutomationProperties.LabeledByProperty, nativeElement);
+			else
+				Control.SetValue(NativeAutomationProperties.LabeledByProperty, _defaultAutomationPropertiesLabeledBy);
+
+			return _defaultAutomationPropertiesLabeledBy;
+		}
+
+		// TODO MAUI: This is not having any effect on anything I've tested yet. See if we need it  
+		// after we test the FP and NP w/ back button explicitly enabled. 
+		public static void SetBackButtonTitle(this PageControl Control, Element Element)
+		{
+			if (Element == null)
+				return;
+
+			var elemValue = ConcatenateNameAndHint(Element);
+
+			Control.BackButtonTitle = elemValue;
+		}
+
+		static string ConcatenateNameAndHint(Element Element)
+		{
+			string separator;
+			
+			var name = (string)Element.GetValue(AutomationProperties.NameProperty);
+
+			var hint = (string)Element.GetValue(AutomationProperties.HelpTextProperty);
+
+
+			if (string.IsNullOrWhiteSpace(name) || string.IsNullOrWhiteSpace(hint))
+				separator = "";
+
+			else
+				separator = ". ";
+
+
+			return string.Join(separator, name, hint);
+
+		}
+
+		public static void SetAutomationProperties(
+			this FrameworkElement frameworkElement, 
+			Element element,
+			IMauiContext mauiContext,
+			string defaultName = null)
+		{
+			frameworkElement.SetAutomationPropertiesAutomationId(element?.AutomationId);
+			 frameworkElement.SetAutomationPropertiesName(element, defaultName);
+			frameworkElement.SetAutomationPropertiesHelpText(element);
+			frameworkElement.SetAutomationPropertiesLabeledBy(element, mauiContext);
+			frameworkElement.SetAutomationPropertiesAccessibilityView(element);
+		}
+	}
+}
diff --git a/src/Compatibility/Core/src/WinUI/Extensions/AspectExtensions.cs b/src/Controls/src/Core/Platform/Windows/Extensions/AspectExtensions.cs
similarity index 86%
rename from src/Compatibility/Core/src/WinUI/Extensions/AspectExtensions.cs
rename to src/Controls/src/Core/Platform/Windows/Extensions/AspectExtensions.cs
index 61f265f72033..ba3fcd80c8c0 100644
--- a/src/Compatibility/Core/src/WinUI/Extensions/AspectExtensions.cs
+++ b/src/Controls/src/Core/Platform/Windows/Extensions/AspectExtensions.cs
@@ -1,6 +1,6 @@
 using WStretch = Microsoft.UI.Xaml.Media.Stretch;
 
-namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
+namespace Microsoft.Maui.Controls.Platform
 {
 	internal static class AspectExtensions
 	{
diff --git a/src/Compatibility/Core/src/WinUI/BrushExtensions.cs b/src/Controls/src/Core/Platform/Windows/Extensions/BrushExtensions.cs
similarity index 93%
rename from src/Compatibility/Core/src/WinUI/BrushExtensions.cs
rename to src/Controls/src/Core/Platform/Windows/Extensions/BrushExtensions.cs
index cc73d8d79014..be1c8da6af98 100644
--- a/src/Compatibility/Core/src/WinUI/BrushExtensions.cs
+++ b/src/Controls/src/Core/Platform/Windows/Extensions/BrushExtensions.cs
@@ -6,7 +6,7 @@
 using WPoint = Windows.Foundation.Point;
 using WRadialGradientBrush = Microsoft.UI.Xaml.Media.RadialGradientBrush;
 
-namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
+namespace Microsoft.Maui.Controls.Platform
 {
 	public static class BrushExtensions
 	{
@@ -22,7 +22,7 @@ public static WBrush ToBrush(this Brush brush)
 					return null;
 				}
 
-				return solidColorBrush.Color.ToBrush();
+				return solidColorBrush.Color.ToNative();
 			}
 
 			if (brush is LinearGradientBrush linearGradientBrush)
@@ -43,7 +43,6 @@ public static WBrush ToBrush(this Brush brush)
 				};
 			}
 
-#if UWP_18362
 			if (brush is RadialGradientBrush radialGradientBrush)
 			{
 				var wRadialGradientBrush = new WRadialGradientBrush()
@@ -61,7 +60,6 @@ public static WBrush ToBrush(this Brush brush)
 
 				return wRadialGradientBrush;
 			}
-#endif
 
 			return null;
 		}
diff --git a/src/Controls/src/Core/Platform/Windows/Extensions/ClipExtensions.cs b/src/Controls/src/Core/Platform/Windows/Extensions/ClipExtensions.cs
new file mode 100644
index 000000000000..475ea014eb0a
--- /dev/null
+++ b/src/Controls/src/Core/Platform/Windows/Extensions/ClipExtensions.cs
@@ -0,0 +1,60 @@
+using Microsoft.UI.Composition;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Hosting;
+using Microsoft.Maui.Controls.Shapes;
+using WRectangleGeometry = Microsoft.UI.Xaml.Media.RectangleGeometry;
+using WVector2 = System.Numerics.Vector2;
+
+
+namespace Microsoft.Maui.Controls.Platform
+{
+	internal static class ClipExtensions
+	{
+		public static void Clip(this FrameworkElement frameworkElement, Geometry geometry)
+		{
+			var wGeometry = geometry.ToNative();
+
+			if (wGeometry is WRectangleGeometry wRectangleGeometry && frameworkElement.Clip != wRectangleGeometry)
+				frameworkElement.Clip = wRectangleGeometry;
+		}
+
+		public static void ClipVisual(this FrameworkElement frameworkElement, Geometry geometry)
+		{
+			var compositor = ElementCompositionPreview.GetElementVisual(frameworkElement).Compositor;
+			var visual = ElementCompositionPreview.GetElementVisual(frameworkElement);
+
+			CompositionClip compositionClip = null;
+
+			if (geometry is EllipseGeometry ellipseGeometry)
+			{
+				var compositionEllipseGeometry = compositor.CreateEllipseGeometry();
+
+				compositionEllipseGeometry.Center = new WVector2((float)ellipseGeometry.Center.X, (float)ellipseGeometry.Center.Y);
+				compositionEllipseGeometry.Radius = new WVector2((float)ellipseGeometry.RadiusX, (float)ellipseGeometry.RadiusY);
+
+				compositionClip = compositor.CreateGeometricClip(compositionEllipseGeometry);
+			}
+			else if (geometry is LineGeometry lineGeometry)
+			{
+				var compositionLineGeometry = compositor.CreateLineGeometry();
+
+				compositionLineGeometry.Start = new WVector2((float)lineGeometry.StartPoint.X, (float)lineGeometry.StartPoint.Y);
+				compositionLineGeometry.End = new WVector2((float)lineGeometry.EndPoint.X, (float)lineGeometry.EndPoint.Y);
+
+				compositionClip = compositor.CreateGeometricClip(compositionLineGeometry);
+			}
+			else if (geometry is RectangleGeometry rectangleGeometry)
+			{
+				var compositionRectangleGeometry = compositor.CreateRectangleGeometry();
+
+				compositionRectangleGeometry.Offset = new WVector2((float)rectangleGeometry.Rect.X, (float)rectangleGeometry.Rect.Y);
+				compositionRectangleGeometry.Size = new WVector2((float)rectangleGeometry.Rect.Width, (float)rectangleGeometry.Rect.Height);
+
+				compositionClip = compositor.CreateGeometricClip(compositionRectangleGeometry);
+			}
+
+			if (visual.Clip != compositionClip)
+				visual.Clip = compositionClip;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/src/Core/Platform/Windows/Extensions/Extensions.cs b/src/Controls/src/Core/Platform/Windows/Extensions/Extensions.cs
new file mode 100644
index 000000000000..4b93c4719447
--- /dev/null
+++ b/src/Controls/src/Core/Platform/Windows/Extensions/Extensions.cs
@@ -0,0 +1,103 @@
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+using Windows.Foundation;
+using Windows.UI.Text;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.Maui.Controls.Internals;
+using WImageSource = Microsoft.UI.Xaml.Media.ImageSource;
+using UwpScrollBarVisibility = Microsoft.UI.Xaml.Controls.ScrollBarVisibility;
+using Microsoft.UI.Xaml.Media.Imaging;
+//using Microsoft.Graphics.Canvas.UI.Xaml;
+
+namespace Microsoft.Maui.Controls.Platform
+{
+	internal static class Extensions
+	{
+		public static ConfiguredTaskAwaitable<T> DontSync<T>(this IAsyncOperation<T> self)
+		{
+			return self.AsTask().ConfigureAwait(false);
+		}
+
+		public static ConfiguredTaskAwaitable DontSync(this IAsyncAction self)
+		{
+			return self.AsTask().ConfigureAwait(false);
+		}
+
+		public static void SetBinding(this FrameworkElement self, DependencyProperty property, string path)
+		{
+			self.SetBinding(property, new Microsoft.UI.Xaml.Data.Binding { Path = new PropertyPath(path) });
+		}
+
+		public static void SetBinding(this FrameworkElement self, DependencyProperty property, string path, Microsoft.UI.Xaml.Data.IValueConverter converter)
+		{
+			self.SetBinding(property, new Microsoft.UI.Xaml.Data.Binding { Path = new PropertyPath(path), Converter = converter });
+		}
+
+		internal static InputScopeNameValue GetKeyboardButtonType(this ReturnType returnType)
+		{
+			switch (returnType)
+			{
+				case ReturnType.Default:
+				case ReturnType.Done:
+				case ReturnType.Go:
+				case ReturnType.Next:
+				case ReturnType.Send:
+					return InputScopeNameValue.Default;
+				case ReturnType.Search:
+					return InputScopeNameValue.Search;
+				default:
+					throw new NotImplementedException($"ReturnType {returnType} not supported");
+			}
+		}
+
+		internal static InputScope ToInputScope(this ReturnType returnType)
+		{
+			var scopeName = new InputScopeName()
+			{
+				NameValue = GetKeyboardButtonType(returnType)
+			};
+
+			var inputScope = new InputScope
+			{
+				Names = { scopeName }
+			};
+
+			return inputScope;
+		}
+
+		internal static UwpScrollBarVisibility ToUwpScrollBarVisibility(this Maui.Controls.ScrollBarVisibility visibility)
+		{
+			switch (visibility)
+			{
+				case Maui.Controls.ScrollBarVisibility.Always:
+					return UwpScrollBarVisibility.Visible;
+				case Maui.Controls.ScrollBarVisibility.Default:
+					return UwpScrollBarVisibility.Auto;
+				case Maui.Controls.ScrollBarVisibility.Never:
+					return UwpScrollBarVisibility.Hidden;
+				default:
+					return UwpScrollBarVisibility.Auto;
+			}
+		}
+
+		public static T Clamp<T>(this T value, T min, T max) where T : IComparable<T>
+		{
+			if (value.CompareTo(min) < 0)
+				return min;
+			if (value.CompareTo(max) > 0)
+				return max;
+			return value;
+		}
+
+
+		internal static int ToEm(this double pt)
+		{
+			return Convert.ToInt32( pt * 0.0624f * 1000); //Coefficient for converting Pt to Em. The value is uniform spacing between characters, in units of 1/1000 of an em.
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/src/Core/Platform/Windows/Extensions/FrameworkElementExtensions.cs b/src/Controls/src/Core/Platform/Windows/Extensions/FrameworkElementExtensions.cs
new file mode 100644
index 000000000000..3c42f95cd852
--- /dev/null
+++ b/src/Controls/src/Core/Platform/Windows/Extensions/FrameworkElementExtensions.cs
@@ -0,0 +1,145 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.Maui.Controls.Internals;
+using WBinding = Microsoft.UI.Xaml.Data.Binding;
+using WBrush = Microsoft.UI.Xaml.Media.Brush;
+using WBindingExpression = Microsoft.UI.Xaml.Data.BindingExpression;
+
+namespace Microsoft.Maui.Controls.Platform
+{
+	internal static class FrameworkElementExtensions
+	{
+		static readonly Lazy<ConcurrentDictionary<Type, DependencyProperty>> ForegroundProperties =
+			new Lazy<ConcurrentDictionary<Type, DependencyProperty>>(() => new ConcurrentDictionary<Type, DependencyProperty>());
+
+		public static WBrush GetForeground(this FrameworkElement element)
+		{
+			if (element == null)
+				throw new ArgumentNullException("element");
+
+			return (WBrush)element.GetValue(GetForegroundProperty(element));
+		}
+
+		public static WBinding GetForegroundBinding(this FrameworkElement element)
+		{
+			WBindingExpression expr = element.GetBindingExpression(GetForegroundProperty(element));
+			if (expr == null)
+				return null;
+
+			return expr.ParentBinding;
+		}
+
+		public static object GetForegroundCache(this FrameworkElement element)
+		{
+			WBinding binding = GetForegroundBinding(element);
+			if (binding != null)
+				return binding;
+
+			return GetForeground(element);
+		}
+
+		public static void RestoreForegroundCache(this FrameworkElement element, object cache)
+		{
+			var binding = cache as WBinding;
+			if (binding != null)
+				SetForeground(element, binding);
+			else
+				SetForeground(element, (WBrush)cache);
+		}
+
+		public static void SetForeground(this FrameworkElement element, WBrush foregroundBrush)
+		{
+			if (element == null)
+				throw new ArgumentNullException("element");
+
+			element.SetValue(GetForegroundProperty(element), foregroundBrush);
+		}
+
+		public static void SetForeground(this FrameworkElement element, WBinding binding)
+		{
+			if (element == null)
+				throw new ArgumentNullException("element");
+
+			element.SetBinding(GetForegroundProperty(element), binding);
+		}
+
+		internal static IEnumerable<T> GetDescendantsByName<T>(this DependencyObject parent, string elementName) where T : DependencyObject
+		{
+			int myChildrenCount = VisualTreeHelper.GetChildrenCount(parent);
+			for (int i = 0; i < myChildrenCount; i++)
+			{
+				var child = VisualTreeHelper.GetChild(parent, i);
+				var controlName = child.GetValue(FrameworkElement.NameProperty) as string;
+				if (controlName == elementName && child is T)
+					yield return child as T;
+				else
+				{
+					foreach (var subChild in child.GetDescendantsByName<T>(elementName))
+						yield return subChild;
+				}
+			}
+		}
+
+		internal static T GetFirstDescendant<T>(this DependencyObject element) where T : FrameworkElement
+		{
+			int count = VisualTreeHelper.GetChildrenCount(element);
+			for (var i = 0; i < count; i++)
+			{
+				DependencyObject child = VisualTreeHelper.GetChild(element, i);
+
+				T target = child as T ?? GetFirstDescendant<T>(child);
+				if (target != null)
+					return target;
+			}
+
+			return null;
+		}
+
+		static DependencyProperty GetForegroundProperty(FrameworkElement element)
+		{
+			if (element is Control)
+				return Control.ForegroundProperty;
+			if (element is TextBlock)
+				return TextBlock.ForegroundProperty;
+
+			Type type = element.GetType();
+
+			DependencyProperty foregroundProperty;
+			if (!ForegroundProperties.Value.TryGetValue(type, out foregroundProperty))
+			{
+				FieldInfo field = ReflectionExtensions.GetFields(type).FirstOrDefault(f => f.Name == "ForegroundProperty");
+				if (field == null)
+					throw new ArgumentException("type is not a Foregroundable type");
+
+				var property = (DependencyProperty)field.GetValue(null);
+				ForegroundProperties.Value.TryAdd(type, property);
+
+				return property;
+			}
+
+			return foregroundProperty;
+		}
+
+		internal static IEnumerable<T> GetChildren<T>(this DependencyObject parent) where T : DependencyObject
+		{
+			int myChildrenCount = VisualTreeHelper.GetChildrenCount(parent);
+			for (int i = 0; i < myChildrenCount; i++)
+			{
+				var child = VisualTreeHelper.GetChild(parent, i);
+				if (child is T)
+					yield return child as T;
+				else
+				{
+					foreach (var subChild in child.GetChildren<T>())
+						yield return subChild;
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/Core/src/WinUI/GeometryExtensions.cs b/src/Controls/src/Core/Platform/Windows/Extensions/GeometryExtensions.cs
similarity index 82%
rename from src/Compatibility/Core/src/WinUI/GeometryExtensions.cs
rename to src/Controls/src/Core/Platform/Windows/Extensions/GeometryExtensions.cs
index e505ea28d78f..54664a8bee98 100644
--- a/src/Compatibility/Core/src/WinUI/GeometryExtensions.cs
+++ b/src/Controls/src/Core/Platform/Windows/Extensions/GeometryExtensions.cs
@@ -1,12 +1,17 @@
+using System;
 using Microsoft.Maui.Controls.Shapes;
 using WFoundation = Windows.Foundation;
 using WMedia = Microsoft.UI.Xaml.Media;
 
-namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
+namespace Microsoft.Maui.Controls.Platform
 {
 	public static class GeometryExtensions
 	{
-		public static WMedia.Geometry ToWindows(this Geometry geometry)
+		[Obsolete("ToWindows is obsolete. Please use ToNative instead")]
+		public static WMedia.Geometry ToWindows(this Geometry geometry) =>
+			geometry.ToNative();
+
+		public static WMedia.Geometry ToNative(this Geometry geometry)
 		{
 			WMedia.Geometry wGeometry = null;
 
@@ -15,8 +20,8 @@ public static WMedia.Geometry ToWindows(this Geometry geometry)
 				LineGeometry lineGeometry = geometry as LineGeometry;
 				wGeometry = new WMedia.LineGeometry
 				{
-					StartPoint = lineGeometry.StartPoint.ToWindows(),
-					EndPoint = lineGeometry.EndPoint.ToWindows()
+					StartPoint = lineGeometry.StartPoint.ToNative(),
+					EndPoint = lineGeometry.EndPoint.ToNative()
 				};
 			}
 			else if (geometry is RectangleGeometry)
@@ -32,7 +37,7 @@ public static WMedia.Geometry ToWindows(this Geometry geometry)
 				EllipseGeometry ellipseGeometry = geometry as EllipseGeometry;
 				wGeometry = new WMedia.EllipseGeometry
 				{
-					Center = ellipseGeometry.Center.ToWindows(),
+					Center = ellipseGeometry.Center.ToNative(),
 					RadiusX = ellipseGeometry.RadiusX,
 					RadiusY = ellipseGeometry.RadiusY
 				};
@@ -47,7 +52,7 @@ public static WMedia.Geometry ToWindows(this Geometry geometry)
 
 				foreach (Geometry children in geometryGroup.Children)
 				{
-					WMedia.Geometry winChild = children.ToWindows();
+					WMedia.Geometry winChild = children.ToNative();
 					(wGeometry as WMedia.GeometryGroup).Children.Add(winChild);
 				}
 			}
@@ -64,7 +69,7 @@ public static WMedia.Geometry ToWindows(this Geometry geometry)
 				{
 					WMedia.PathFigure wPathFigure = new WMedia.PathFigure
 					{
-						StartPoint = xamPathFigure.StartPoint.ToWindows(),
+						StartPoint = xamPathFigure.StartPoint.ToNative(),
 						IsFilled = xamPathFigure.IsFilled,
 						IsClosed = xamPathFigure.IsClosed
 					};
@@ -79,7 +84,7 @@ public static WMedia.Geometry ToWindows(this Geometry geometry)
 
 							WMedia.LineSegment winSegment = new WMedia.LineSegment
 							{
-								Point = lineSegment.Point.ToWindows()
+								Point = lineSegment.Point.ToNative()
 							};
 
 							wPathFigure.Segments.Add(winSegment);
@@ -93,7 +98,7 @@ public static WMedia.Geometry ToWindows(this Geometry geometry)
 
 							foreach (var point in polyLineSegment.Points)
 							{
-								wSegment.Points.Add(point.ToWindows());
+								wSegment.Points.Add(point.ToNative());
 							}
 
 							wPathFigure.Segments.Add(wSegment);
@@ -106,9 +111,9 @@ public static WMedia.Geometry ToWindows(this Geometry geometry)
 
 							WMedia.BezierSegment wSegment = new WMedia.BezierSegment
 							{
-								Point1 = bezierSegment.Point1.ToWindows(),
-								Point2 = bezierSegment.Point2.ToWindows(),
-								Point3 = bezierSegment.Point3.ToWindows()
+								Point1 = bezierSegment.Point1.ToNative(),
+								Point2 = bezierSegment.Point2.ToNative(),
+								Point3 = bezierSegment.Point3.ToNative()
 							};
 
 							wPathFigure.Segments.Add(wSegment);
@@ -121,7 +126,7 @@ public static WMedia.Geometry ToWindows(this Geometry geometry)
 
 							foreach (var point in polyBezierSegment.Points)
 							{
-								wSegment.Points.Add(point.ToWindows());
+								wSegment.Points.Add(point.ToNative());
 							}
 
 							wPathFigure.Segments.Add(wSegment);
@@ -134,8 +139,8 @@ public static WMedia.Geometry ToWindows(this Geometry geometry)
 
 							WMedia.QuadraticBezierSegment wSegment = new WMedia.QuadraticBezierSegment
 							{
-								Point1 = quadraticBezierSegment.Point1.ToWindows(),
-								Point2 = quadraticBezierSegment.Point2.ToWindows()
+								Point1 = quadraticBezierSegment.Point1.ToNative(),
+								Point2 = quadraticBezierSegment.Point2.ToNative()
 							};
 
 							wPathFigure.Segments.Add(wSegment);
@@ -148,7 +153,7 @@ public static WMedia.Geometry ToWindows(this Geometry geometry)
 
 							foreach (var point in polyQuadraticBezierSegment.Points)
 							{
-								wSegment.Points.Add(point.ToWindows());
+								wSegment.Points.Add(point.ToNative());
 							}
 
 							wPathFigure.Segments.Add(wSegment);
@@ -164,7 +169,7 @@ public static WMedia.Geometry ToWindows(this Geometry geometry)
 								RotationAngle = arcSegment.RotationAngle,
 								IsLargeArc = arcSegment.IsLargeArc,
 								SweepDirection = arcSegment.SweepDirection == SweepDirection.Clockwise ? WMedia.SweepDirection.Clockwise : WMedia.SweepDirection.Counterclockwise,
-								Point = arcSegment.Point.ToWindows()
+								Point = arcSegment.Point.ToNative()
 							};
 
 							wPathFigure.Segments.Add(wSegment);
diff --git a/src/Controls/src/Core/Platform/Windows/Extensions/ImageExtensions.cs b/src/Controls/src/Core/Platform/Windows/Extensions/ImageExtensions.cs
new file mode 100644
index 000000000000..cce1a59eeb4d
--- /dev/null
+++ b/src/Controls/src/Core/Platform/Windows/Extensions/ImageExtensions.cs
@@ -0,0 +1,130 @@
+using System;
+using Microsoft.Graphics.Canvas.UI.Xaml;
+using Microsoft.UI.Xaml.Media.Imaging;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+using Windows.Foundation;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.Maui.Controls.Internals;
+using WImageSource = Microsoft.UI.Xaml.Media.ImageSource;
+
+namespace Microsoft.Maui.Controls.Platform
+{
+	internal static class ImageExtensions
+	{
+		public static Graphics.Size GetImageSourceSize(this WImageSource source)
+		{
+			if (source is null)
+			{
+				return Graphics.Size.Zero;
+			}
+			else if (source is BitmapSource bitmap)
+			{
+				return new Graphics.Size
+				{
+					Width = bitmap.PixelWidth,
+					Height = bitmap.PixelHeight
+				};
+			}
+			else if (source is CanvasImageSource canvas)
+			{
+				return new Graphics.Size
+				{
+					Width = canvas.Size.Width,
+					Height = canvas.Size.Height
+				};
+			}
+
+			throw new InvalidCastException($"\"{source.GetType().FullName}\" is not supported.");
+		}
+
+		public static Microsoft.UI.Xaml.Controls.IconSource ToWindowsIconSource(this ImageSource source)
+		{
+			return source.ToWindowsIconSourceAsync().GetAwaiter().GetResult();
+		}
+
+		public static async Task<Microsoft.UI.Xaml.Controls.IconSource> ToWindowsIconSourceAsync(this ImageSource source, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			if (source == null || source.IsEmpty)
+				return null;
+
+			var handler = Registrar.Registered.GetHandlerForObject<IIconElementHandler>(source);
+			if (handler == null)
+				return null;
+
+			try
+			{
+				return await handler.LoadIconSourceAsync(source, cancellationToken);
+			}
+			catch (OperationCanceledException)
+			{
+				// no-op
+			}
+
+			return null;
+		}
+
+		public static IconElement ToWindowsIconElement(this ImageSource source)
+		{
+			return source.ToWindowsIconElementAsync().GetAwaiter().GetResult();
+		}
+
+		public static async Task<IconElement> ToWindowsIconElementAsync(this ImageSource source, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			if (source == null || source.IsEmpty)
+				return null;
+
+			var handler = Registrar.Registered.GetHandlerForObject<IIconElementHandler>(source);
+			if (handler == null)
+				return null;
+
+			try
+			{
+				return await handler.LoadIconElementAsync(source, cancellationToken);
+			}
+			catch (OperationCanceledException)
+			{
+				// no-op
+			}
+
+			return null;
+		}
+
+		public static WImageSource ToWindowsImageSource(this ImageSource source)
+		{
+			return source.ToWindowsImageSourceAsync().GetAwaiter().GetResult();
+		}
+
+		public static async Task<WImageSource> ToWindowsImageSourceAsync(this ImageSource source, CancellationToken cancellationToken = default(CancellationToken))
+		{
+			if (source == null || source.IsEmpty)
+				return null;
+
+			var handler = Registrar.Registered.GetHandlerForObject<IImageSourceHandler>(source);
+			if (handler == null)
+				return null;
+
+			try
+			{
+				return await handler.LoadImageAsync(source, cancellationToken);
+			}
+			catch (OperationCanceledException)
+			{
+				Log.Warning("Image loading", "Image load cancelled");
+			}
+			catch (Exception ex)
+			{
+				Log.Warning("Image loading", $"Image load failed: {ex}");
+#if DEBUG
+				throw;
+#endif
+			}
+
+			return null;
+		}
+	}
+}
diff --git a/src/Controls/src/Core/Platform/Windows/Extensions/PointExtensions.cs b/src/Controls/src/Core/Platform/Windows/Extensions/PointExtensions.cs
new file mode 100644
index 000000000000..e00e2d0f5219
--- /dev/null
+++ b/src/Controls/src/Core/Platform/Windows/Extensions/PointExtensions.cs
@@ -0,0 +1,12 @@
+using System;
+using Microsoft.Maui.Graphics;
+using WPoint = Windows.Foundation.Point;
+
+namespace Microsoft.Maui.Controls.Platform
+{
+	public static class PointExtensions
+	{
+		[Obsolete("ToWindows is obsolete. Please use ToNative instead")]
+		public static WPoint ToWindows(this Point point) => point.ToNative();
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/Core/src/WinUI/Extensions/TextBlockExtensions.cs b/src/Controls/src/Core/Platform/Windows/Extensions/TextBlockExtensions.cs
similarity index 95%
rename from src/Compatibility/Core/src/WinUI/Extensions/TextBlockExtensions.cs
rename to src/Controls/src/Core/Platform/Windows/Extensions/TextBlockExtensions.cs
index 04095e97f50a..dd033806716c 100644
--- a/src/Compatibility/Core/src/WinUI/Extensions/TextBlockExtensions.cs
+++ b/src/Controls/src/Core/Platform/Windows/Extensions/TextBlockExtensions.cs
@@ -2,7 +2,7 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 
-namespace Microsoft.Maui.Controls.Compatibility.Platform.UAP.Extensions
+namespace Microsoft.Maui.Controls.Platform
 {
 	internal static class TextBlockExtensions
 	{
diff --git a/src/Compatibility/Core/src/WinUI/Extensions/TransformExtensions.cs b/src/Controls/src/Core/Platform/Windows/Extensions/TransformExtensions.cs
similarity index 68%
rename from src/Compatibility/Core/src/WinUI/Extensions/TransformExtensions.cs
rename to src/Controls/src/Core/Platform/Windows/Extensions/TransformExtensions.cs
index c1d9ca83f432..2081b5d68fcb 100644
--- a/src/Compatibility/Core/src/WinUI/Extensions/TransformExtensions.cs
+++ b/src/Controls/src/Core/Platform/Windows/Extensions/TransformExtensions.cs
@@ -1,16 +1,9 @@
 using Microsoft.Maui.Controls.Shapes;
 
-#if WINDOWS_UWP
 using WMatrix = Microsoft.UI.Xaml.Media.Matrix;
 using WMatrixTransform = Microsoft.UI.Xaml.Media.MatrixTransform;
 
-namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
-#else
-using WMatrix = System.Windows.Media.Matrix;
-using WMatrixTransform = System.Windows.Media.MatrixTransform;
-
-namespace Microsoft.Maui.Controls.Compatibility.Platform.WPF
-#endif
+namespace Microsoft.Maui.Controls.Platform
 {
 	public static class TransformExtensions
 	{
diff --git a/src/Controls/src/Core/Platform/Windows/Extensions/ViewExtensions.cs b/src/Controls/src/Core/Platform/Windows/Extensions/ViewExtensions.cs
new file mode 100644
index 000000000000..28e42188fdc8
--- /dev/null
+++ b/src/Controls/src/Core/Platform/Windows/Extensions/ViewExtensions.cs
@@ -0,0 +1,20 @@
+using System.Collections.Generic;
+
+namespace Microsoft.Maui.Controls.Platform
+{
+	internal static class ViewExtensions
+	{
+		public static IEnumerable<IPage> GetParentPages(this IView target)
+		{
+			var result = new List<IPage>();
+			var parent = target.Parent as IPage;
+			while (!Application.IsApplicationOrNull(parent))
+			{
+				result.Add(parent);
+				parent = parent.Parent as IPage;
+			}
+
+			return result;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/src/Core/Platform/Windows/Extensions/VisualElementExtensions.cs b/src/Controls/src/Core/Platform/Windows/Extensions/VisualElementExtensions.cs
new file mode 100644
index 000000000000..6c29acfb9222
--- /dev/null
+++ b/src/Controls/src/Core/Platform/Windows/Extensions/VisualElementExtensions.cs
@@ -0,0 +1,48 @@
+using System;
+using Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific;
+
+namespace Microsoft.Maui.Controls.Platform
+{
+	public static class VisualElementExtensions
+	{
+		public static IViewHandler GetOrCreateHandler(this IView self, IMauiContext mauiContext)
+		{
+			if (self == null)
+				throw new ArgumentNullException("self");
+
+			if (self.Handler != null)
+				return self.Handler;
+
+			self.ToNative(mauiContext);
+			return self.Handler;
+		}
+
+		// TODO MAUI Make this work against IVIEW
+		internal static void Cleanup(this VisualElement self)
+		{
+			if (self == null)
+				throw new ArgumentNullException("self");
+
+			IViewHandler handler = self.Handler;
+
+			foreach (Element element in self.Descendants())
+			{
+				var visual = element as VisualElement;
+				if (visual == null)
+					continue;
+
+				visual.Handler = null;
+			}
+
+			self.Handler = null;
+		}
+
+		internal static bool UseFormsVsm<T>(this T element) where T : VisualElement, IElementConfiguration<T>
+		{
+			// Determine whether we're letting the VSM handle the colors or doing it the old way
+			// or disabling the legacy color management and doing it the old-old (pre 2.0) way
+			return element.HasVisualStateGroups()
+					|| !element.OnThisPlatform().GetIsLegacyColorModeEnabled();
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/src/Core/Platform/Windows/Extensions/WinUIHelpers.cs b/src/Controls/src/Core/Platform/Windows/Extensions/WinUIHelpers.cs
new file mode 100644
index 000000000000..e12a5f6439b0
--- /dev/null
+++ b/src/Controls/src/Core/Platform/Windows/Extensions/WinUIHelpers.cs
@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WThickness = Microsoft.UI.Xaml.Thickness;
+using WCornerRadius = Microsoft.UI.Xaml.CornerRadius;
+using WGridLength = Microsoft.UI.Xaml.GridLength;
+using UwpGridUnitType = Microsoft.UI.Xaml.GridUnitType;
+
+namespace Microsoft.Maui.Controls.Platform
+{
+	static class WinUIHelpers
+	{
+		public static WThickness CreateThickness(double left, double top, double right, double bottom)
+		{
+			return new WThickness
+			{
+				Left = left,
+				Top = top,
+				Right = right,
+				Bottom = bottom
+			};
+		}
+
+		public static WThickness CreateThickness(double all)
+		{
+			return new WThickness
+			{
+				Left = all,
+				Top = all,
+				Right = all,
+				Bottom = all
+			};
+		}
+		public static WCornerRadius CreateCornerRadius(double left, double top, double right, double bottom)
+		{
+			return new WCornerRadius
+			{
+				TopLeft = left,
+				TopRight = top,
+				BottomRight = right,
+				BottomLeft = bottom
+			};
+		}
+
+		public static WCornerRadius CreateCornerRadius(double all)
+		{
+			return new WCornerRadius
+			{
+				TopLeft = all,
+				TopRight = all,
+				BottomRight = all,
+				BottomLeft = all
+			};
+		}
+
+		public static WGridLength CreateGridLength(int v, UwpGridUnitType auto)
+		{
+			return new WGridLength(v, auto);
+		}
+	}
+}
diff --git a/src/Controls/src/Core/Platform/Windows/IDontGetFocus.cs b/src/Controls/src/Core/Platform/Windows/IDontGetFocus.cs
new file mode 100644
index 000000000000..d1229d0f97a2
--- /dev/null
+++ b/src/Controls/src/Core/Platform/Windows/IDontGetFocus.cs
@@ -0,0 +1,6 @@
+namespace Microsoft.Maui.Controls.Platform
+{
+	public interface IDontGetFocus
+	{
+	}
+}
diff --git a/src/Compatibility/Core/src/WinUI/IIconElementHandler.cs b/src/Controls/src/Core/Platform/Windows/IIconElementHandler.cs
similarity index 87%
rename from src/Compatibility/Core/src/WinUI/IIconElementHandler.cs
rename to src/Controls/src/Core/Platform/Windows/IIconElementHandler.cs
index c352fdb4b032..642395bbb505 100644
--- a/src/Compatibility/Core/src/WinUI/IIconElementHandler.cs
+++ b/src/Controls/src/Core/Platform/Windows/IIconElementHandler.cs
@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using Microsoft.UI.Xaml.Controls;
 
-namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
+namespace Microsoft.Maui.Controls.Platform
 {
 	public interface IIconElementHandler : IRegisterable
 	{
diff --git a/src/Compatibility/Core/src/WinUI/IImageSourceHandler.cs b/src/Controls/src/Core/Platform/Windows/IImageSourceHandler.cs
similarity index 81%
rename from src/Compatibility/Core/src/WinUI/IImageSourceHandler.cs
rename to src/Controls/src/Core/Platform/Windows/IImageSourceHandler.cs
index e28e30f767cc..0afa367f6efe 100644
--- a/src/Compatibility/Core/src/WinUI/IImageSourceHandler.cs
+++ b/src/Controls/src/Core/Platform/Windows/IImageSourceHandler.cs
@@ -1,7 +1,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
+namespace Microsoft.Maui.Controls.Platform
 {
 	public interface IImageSourceHandler : IRegisterable
 	{
diff --git a/src/Controls/src/Core/Platform/Windows/ITabStopOnDescendants.cs b/src/Controls/src/Core/Platform/Windows/ITabStopOnDescendants.cs
new file mode 100644
index 000000000000..1bddbd1b0e67
--- /dev/null
+++ b/src/Controls/src/Core/Platform/Windows/ITabStopOnDescendants.cs
@@ -0,0 +1,6 @@
+namespace Microsoft.Maui.Controls.Platform
+{
+	public interface ITabStopOnDescendants : IDontGetFocus
+	{
+	}
+}
diff --git a/src/Controls/src/Core/Platform/Windows/ITitleIconProvider.cs b/src/Controls/src/Core/Platform/Windows/ITitleIconProvider.cs
new file mode 100644
index 000000000000..89db007f9787
--- /dev/null
+++ b/src/Controls/src/Core/Platform/Windows/ITitleIconProvider.cs
@@ -0,0 +1,7 @@
+namespace Microsoft.Maui.Controls.Platform
+{
+	internal interface ITitleIconProvider
+	{
+		Microsoft.UI.Xaml.Media.ImageSource TitleIcon { get; set; }
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/src/Core/Platform/Windows/ITitleProvider.cs b/src/Controls/src/Core/Platform/Windows/ITitleProvider.cs
new file mode 100644
index 000000000000..c4cbfc5e8ba8
--- /dev/null
+++ b/src/Controls/src/Core/Platform/Windows/ITitleProvider.cs
@@ -0,0 +1,15 @@
+using WBrush = Microsoft.UI.Xaml.Media.Brush;
+
+namespace Microsoft.Maui.Controls.Platform
+{
+	internal interface ITitleProvider
+	{
+		WBrush BarBackgroundBrush { set; }
+
+		WBrush BarForegroundBrush { set; }
+
+		bool ShowTitle { get; set; }
+
+		string Title { get; set; }
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/src/Core/Platform/Windows/ITitleViewProvider.cs b/src/Controls/src/Core/Platform/Windows/ITitleViewProvider.cs
new file mode 100644
index 000000000000..558a514ec898
--- /dev/null
+++ b/src/Controls/src/Core/Platform/Windows/ITitleViewProvider.cs
@@ -0,0 +1,7 @@
+namespace Microsoft.Maui.Controls.Platform
+{
+	internal interface ITitleViewProvider
+	{
+		View TitleView { get; set; }
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/src/Core/Platform/Windows/ITitleViewRendererController.cs b/src/Controls/src/Core/Platform/Windows/ITitleViewRendererController.cs
new file mode 100644
index 000000000000..60adf5b3f54c
--- /dev/null
+++ b/src/Controls/src/Core/Platform/Windows/ITitleViewRendererController.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+
+namespace Microsoft.Maui.Controls.Platform
+{
+	internal interface ITitleViewRendererController
+	{
+		View TitleView { get; }
+		FrameworkElement TitleViewPresenter { get; }
+		Visibility TitleViewVisibility { get; set; }
+		CommandBar CommandBar { get; }
+	}
+}
diff --git a/src/Controls/src/Core/Platform/Windows/IToolBarForegroundBinder.cs b/src/Controls/src/Core/Platform/Windows/IToolBarForegroundBinder.cs
new file mode 100644
index 000000000000..0eabc80b4ce2
--- /dev/null
+++ b/src/Controls/src/Core/Platform/Windows/IToolBarForegroundBinder.cs
@@ -0,0 +1,10 @@
+using Microsoft.UI.Xaml.Controls;
+
+namespace Microsoft.Maui.Controls.Platform
+{
+	internal interface IToolBarForegroundBinder
+	{
+		void BindForegroundColor(AppBar appBar);
+		void BindForegroundColor(AppBarButton button);
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/src/Core/Platform/Windows/IToolbarProvider.cs b/src/Controls/src/Core/Platform/Windows/IToolbarProvider.cs
new file mode 100644
index 000000000000..e205053cce1f
--- /dev/null
+++ b/src/Controls/src/Core/Platform/Windows/IToolbarProvider.cs
@@ -0,0 +1,10 @@
+using System.Threading.Tasks;
+using Microsoft.UI.Xaml.Controls;
+
+namespace Microsoft.Maui.Controls.Platform
+{
+	internal interface IToolbarProvider
+	{
+		Task<CommandBar> GetCommandBarAsync();
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/src/Core/Platform/Windows/ImageConverter.cs b/src/Controls/src/Core/Platform/Windows/ImageConverter.cs
new file mode 100644
index 000000000000..59bd32c13766
--- /dev/null
+++ b/src/Controls/src/Core/Platform/Windows/ImageConverter.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.Maui.Controls.Internals;
+
+namespace Microsoft.Maui.Controls.Platform
+{
+	public class ImageConverter : Microsoft.UI.Xaml.Data.IValueConverter
+	{
+		public object Convert(object value, Type targetType, object parameter, string language)
+		{
+			return value is ImageSource source
+				? source.ToWindowsImageSourceAsync().AsAsyncValue()
+				: null;
+		}
+
+		public object ConvertBack(object value, Type targetType, object parameter, string language)
+		{
+			throw new NotSupportedException();
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/src/Core/Platform/Windows/ImageSourceIconElementConverter.cs b/src/Controls/src/Core/Platform/Windows/ImageSourceIconElementConverter.cs
new file mode 100644
index 000000000000..e618b851f715
--- /dev/null
+++ b/src/Controls/src/Core/Platform/Windows/ImageSourceIconElementConverter.cs
@@ -0,0 +1,20 @@
+using System;
+
+namespace Microsoft.Maui.Controls.Platform
+{
+	internal class ImageSourceIconElementConverter : Microsoft.UI.Xaml.Data.IValueConverter
+	{
+		public object Convert(object value, Type targetType, object parameter, string language)
+		{
+			if (value is ImageSource source)
+				return source.ToWindowsIconElement();
+
+			return null;
+		}
+
+		public object ConvertBack(object value, Type targetType, object parameter, string language)
+		{
+			throw new NotImplementedException();
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/src/Core/Platform/Windows/MauiCommandBar.cs b/src/Controls/src/Core/Platform/Windows/MauiCommandBar.cs
new file mode 100644
index 000000000000..2bd05764de7f
--- /dev/null
+++ b/src/Controls/src/Core/Platform/Windows/MauiCommandBar.cs
@@ -0,0 +1,151 @@
+using System;
+using Windows.Foundation.Collections;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Media;
+using WVisibility = Microsoft.UI.Xaml.Visibility;
+
+namespace Microsoft.Maui.Controls.Platform
+{
+	public class MauiCommandBar : CommandBar
+	{
+		Microsoft.UI.Xaml.Controls.Button _moreButton;
+		Microsoft.UI.Xaml.Controls.ItemsControl _primaryItemsControl;
+		bool _isInValidLocation;
+
+		public MauiCommandBar()
+		{
+			PrimaryCommands.VectorChanged += OnCommandsChanged;
+			SecondaryCommands.VectorChanged += OnCommandsChanged;
+			UpdateVisibility();
+			WatchForContentChanges();
+		}
+
+		// Set by the container if the container is a valid place to show a toolbar.
+		// This exists to provide consistency with the other platforms; we've got 
+		// rules in place that limit toolbars to Navigation Page and to Tabbed 
+		// and Flyout-Detail Pages when they're currently displaying a Navigation Page
+		public bool IsInValidLocation
+		{
+			get { return _isInValidLocation; }
+			set
+			{
+				_isInValidLocation = value;
+				UpdateVisibility();
+			}
+		}
+
+		protected override void OnApplyTemplate()
+		{
+			base.OnApplyTemplate();
+
+			_moreButton = GetTemplateChild("MoreButton") as Microsoft.UI.Xaml.Controls.Button;
+			_primaryItemsControl = GetTemplateChild("PrimaryItemsControl") as Microsoft.UI.Xaml.Controls.ItemsControl;
+		}
+
+		void OnCommandsChanged(IObservableVector<ICommandBarElement> sender, IVectorChangedEventArgs args)
+		{
+			UpdateVisibility();
+		}
+
+		void UpdateVisibility()
+		{
+			// Determine whether we have a title (or some other content) inside this command bar
+			var frameworkElement = Content as FrameworkElement;
+
+			// Apply the rules for consistency with other platforms
+
+			// Not in one of the acceptable toolbar locations from the other platforms
+			if (!IsInValidLocation)
+			{
+				// If there's no title to display (e.g., toolbarplacement is set to bottom)
+				// or the title is collapsed (e.g., because it's empty)
+				if (frameworkElement == null || frameworkElement.Visibility != WVisibility.Visible)
+				{
+					// Just collapse the whole thing
+					Visibility = WVisibility.Collapsed;
+					return;
+				}
+			
+				// The title needs to be visible, but we're not allowed to show a toolbar
+				// So we need to hide the toolbar items
+
+				Visibility = WVisibility.Visible;
+
+				if (_moreButton != null)
+				{
+					_moreButton.Visibility = WVisibility.Collapsed;
+				}
+
+				if (_primaryItemsControl != null)
+				{
+					_primaryItemsControl.Visibility = WVisibility.Collapsed;
+				}
+
+				return;
+			}
+
+			// We're in one of the acceptable toolbar locations from the other platforms so the normal rules apply
+
+			if (_primaryItemsControl != null)
+			{
+				// This is normally visible by default, but it might have been collapsed by the toolbar consistency rules above
+				_primaryItemsControl.Visibility = WVisibility.Visible;
+			}
+
+			// Are there any commands to display?
+			var visibility = PrimaryCommands.Count + SecondaryCommands.Count > 0 ? WVisibility.Visible : WVisibility.Collapsed;
+
+			if (_moreButton != null)
+			{
+				// The "..." button should only be visible if we have commands to display
+				_moreButton.Visibility = visibility;
+
+				// There *is* an OverflowButtonVisibility property that does more or less the same thing, 
+				// but it became available in 10.0.14393.0 and we have to support 10.0.10240
+			}
+			
+			if (frameworkElement != null && frameworkElement.Visibility != WVisibility.Collapsed)
+			{
+				// If there's a title to display, we have to be visible whether or not we have commands
+				Visibility = WVisibility.Visible;
+			}
+			else
+			{
+				// Otherwise, visibility depends on whether we have commands
+				Visibility = visibility;
+			}
+		}
+
+		void WatchForContentChanges()
+		{
+			// If the content of the command bar changes while it's collapsed, we need to 
+			// react and update the visibility (e.g., if the bar is placed at the bottom and
+			// has no commands, then is moved to the top and now includes the title)
+
+			// There's no event on CommandBar when the content changes, so we'll bind our own
+			// dependency property to Content and update our visibility when it changes
+			var binding = new Microsoft.UI.Xaml.Data.Binding
+			{
+				Source = this,
+				Path = new PropertyPath(nameof(Content)),
+				Mode = Microsoft.UI.Xaml.Data.BindingMode.OneWay
+			};
+
+			BindingOperations.SetBinding(this, s_contentChangeWatcher, binding);
+		}
+
+		static readonly DependencyProperty s_contentChangeWatcher =
+			DependencyProperty.Register(
+				"ContentChangeWatcher",
+				typeof(object),
+				typeof(object),
+				new PropertyMetadata(null, ContentChanged));
+
+		static void ContentChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+		{
+			(d as MauiCommandBar)?.UpdateVisibility();
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/src/Core/Platform/Windows/MauiPresenter.cs b/src/Controls/src/Core/Platform/Windows/MauiPresenter.cs
new file mode 100644
index 000000000000..4c46fa6b9250
--- /dev/null
+++ b/src/Controls/src/Core/Platform/Windows/MauiPresenter.cs
@@ -0,0 +1,30 @@
+using System;
+using Microsoft.UI.Xaml;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui.Graphics;
+
+namespace Microsoft.Maui.Controls.Platform
+{
+	internal class MauiPresenter : Microsoft.UI.Xaml.Controls.ContentPresenter
+	{
+		public MauiPresenter()
+		{
+			Loaded += FormsPresenter_Loaded;
+			Unloaded += FormsPresenter_Unloaded;
+			SizeChanged += (s, e) =>
+			{
+				if (ActualWidth > 0 && ActualHeight > 0 && DataContext != null)
+				{
+					var page = (Page)DataContext;
+					((Page)page.RealParent).ContainerArea = new Rectangle(0, 0, ActualWidth, ActualHeight);
+				}
+			};
+		}
+
+		void FormsPresenter_Loaded(object sender, RoutedEventArgs e)
+			=> (DataContext as Page)?.SendAppearing();
+
+		void FormsPresenter_Unloaded(object sender, RoutedEventArgs e)
+			=> (DataContext as Page)?.SendDisappearing();
+	}
+}
diff --git a/src/Controls/src/Core/Platform/Windows/MenuItemCommand.cs b/src/Controls/src/Core/Platform/Windows/MenuItemCommand.cs
new file mode 100644
index 000000000000..a89c25367aa5
--- /dev/null
+++ b/src/Controls/src/Core/Platform/Windows/MenuItemCommand.cs
@@ -0,0 +1,42 @@
+using System;
+using System.ComponentModel;
+using System.Windows.Input;
+
+namespace Microsoft.Maui.Controls.Platform
+{
+	internal class MenuItemCommand : ICommand
+	{
+		readonly MenuItem _menuItem;
+
+		public MenuItemCommand(MenuItem item)
+		{
+			_menuItem = item;
+			_menuItem.PropertyChanged += OnElementPropertyChanged;
+		}
+
+		public virtual bool CanExecute(object parameter)
+		{
+			return _menuItem.IsEnabled;
+		}
+
+		public event EventHandler CanExecuteChanged;
+
+		public void Execute(object parameter)
+		{
+			((IMenuItemController)_menuItem).Activate();
+		}
+
+		void OnCanExecuteChanged()
+		{
+			EventHandler changed = CanExecuteChanged;
+			if (changed != null)
+				changed(this, EventArgs.Empty);
+		}
+
+		void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
+		{
+			if (e.PropertyName == VisualElement.IsEnabledProperty.PropertyName)
+				OnCanExecuteChanged();
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/src/Core/Platform/Windows/NativeBindingExtensions.cs b/src/Controls/src/Core/Platform/Windows/NativeBindingExtensions.cs
new file mode 100644
index 000000000000..bd055420e86f
--- /dev/null
+++ b/src/Controls/src/Core/Platform/Windows/NativeBindingExtensions.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using Microsoft.UI.Xaml;
+using Microsoft.Maui.Controls.Internals;
+using static System.String;
+
+namespace Microsoft.Maui.Controls.Platform
+{
+	public static class NativeBindingExtensions
+	{
+		// TODO MAUI
+		//public static void SetBinding(this FrameworkElement view, string propertyName, BindingBase bindingBase, string updateSourceEventName = null)
+		//{
+		//	var binding = bindingBase as Binding;
+		//	updateSourceEventName = updateSourceEventName ?? binding?.UpdateSourceEventName;
+
+		//	if (IsNullOrEmpty(updateSourceEventName))
+		//	{
+		//		NativePropertyListener nativePropertyListener = null;
+		//		if (bindingBase.Mode == BindingMode.TwoWay)
+		//			nativePropertyListener = new NativePropertyListener(view, propertyName);
+
+		//		NativeBindingHelpers.SetBinding(view, propertyName, bindingBase, nativePropertyListener as INotifyPropertyChanged);
+		//		return;
+		//	}
+
+		//	NativeEventWrapper eventE = null;
+		//	if (binding.Mode == BindingMode.TwoWay && !(view is INotifyPropertyChanged))
+		//		eventE = new NativeEventWrapper(view, propertyName, updateSourceEventName);
+
+		//	NativeBindingHelpers.SetBinding(view, propertyName, binding, eventE);
+		//}
+
+		public static void SetBinding(this FrameworkElement view, BindableProperty targetProperty, BindingBase binding)
+		{
+			NativeBindingHelpers.SetBinding(view, targetProperty, binding);
+		}
+
+		public static void SetValue(this FrameworkElement target, BindableProperty targetProperty, object value)
+		{
+			NativeBindingHelpers.SetValue(target, targetProperty, value);
+		}
+
+		public static void SetBindingContext(this FrameworkElement target, object bindingContext, Func<FrameworkElement, IEnumerable<FrameworkElement>> getChildren = null)
+		{
+			NativeBindingHelpers.SetBindingContext(target, bindingContext, getChildren);
+		}
+
+		internal static void TransferbindablePropertiesToWrapper(this FrameworkElement target, View wrapper)
+		{
+			NativeBindingHelpers.TransferBindablePropertiesToWrapper(target, wrapper);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/src/Core/Platform/Windows/PageControl.cs b/src/Controls/src/Core/Platform/Windows/PageControl.cs
new file mode 100644
index 000000000000..de90d10fc1d5
--- /dev/null
+++ b/src/Controls/src/Core/Platform/Windows/PageControl.cs
@@ -0,0 +1,184 @@
+using System.Threading.Tasks;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific;
+using WBrush = Microsoft.UI.Xaml.Media.Brush;
+using WImageSource = Microsoft.UI.Xaml.Media.ImageSource;
+using WVisibility = Microsoft.UI.Xaml.Visibility;
+
+namespace Microsoft.Maui.Controls.Platform
+{
+	public sealed class PageControl : ContentControl, IToolbarProvider, ITitleViewRendererController
+	{
+		public static readonly DependencyProperty TitleVisibilityProperty = DependencyProperty.Register(nameof(TitleVisibility), typeof(WVisibility), typeof(PageControl), new PropertyMetadata(WVisibility.Visible));
+
+		public static readonly DependencyProperty ToolbarBackgroundProperty = DependencyProperty.Register(nameof(ToolbarBackground), typeof(WBrush), typeof(PageControl),
+			new PropertyMetadata(default(WBrush)));
+
+		public static readonly DependencyProperty BackButtonTitleProperty = DependencyProperty.Register("BackButtonTitle", typeof(string), typeof(PageControl), new PropertyMetadata(false));
+
+		public static readonly DependencyProperty ContentMarginProperty = DependencyProperty.Register("ContentMargin", typeof(Microsoft.UI.Xaml.Thickness), typeof(PageControl),
+			new PropertyMetadata(default(Microsoft.UI.Xaml.Thickness)));
+
+		public static readonly DependencyProperty TitleIconProperty = DependencyProperty.Register(nameof(TitleIcon), typeof(WImageSource), typeof(PageControl), new PropertyMetadata(default(WImageSource)));
+
+		public static readonly DependencyProperty TitleViewProperty = DependencyProperty.Register(nameof(TitleView), typeof(View), typeof(PageControl), new PropertyMetadata(default(View), OnTitleViewPropertyChanged));
+
+		public static readonly DependencyProperty TitleViewVisibilityProperty = DependencyProperty.Register(nameof(TitleViewVisibility), typeof(WVisibility), typeof(PageControl), new PropertyMetadata(WVisibility.Collapsed));
+
+		public static readonly DependencyProperty TitleInsetProperty = DependencyProperty.Register("TitleInset", typeof(double), typeof(PageControl), new PropertyMetadata(default(double)));
+
+		public static readonly DependencyProperty TitleBrushProperty = DependencyProperty.Register("TitleBrush", typeof(WBrush), typeof(PageControl), new PropertyMetadata(null));
+
+		CommandBar _commandBar;
+		FrameworkElement _titleViewPresenter;
+
+        ToolbarPlacement _toolbarPlacement;
+		bool _toolbarDynamicOverflowEnabled = true;
+		readonly ToolbarPlacementHelper _toolbarPlacementHelper = new ToolbarPlacementHelper();
+
+		public bool ShouldShowToolbar
+		{
+			get { return _toolbarPlacementHelper.ShouldShowToolBar; }
+			set { _toolbarPlacementHelper.ShouldShowToolBar = value; }
+		}
+
+		public WImageSource TitleIcon
+		{
+			get { return (WImageSource)GetValue(TitleIconProperty); }
+			set { SetValue(TitleIconProperty, value); }
+		}
+
+		public View TitleView
+		{
+			get { return (View)GetValue(TitleViewProperty); }
+			set { SetValue(TitleViewProperty, value); }
+		}
+
+		TaskCompletionSource<CommandBar> _commandBarTcs;
+		Microsoft.UI.Xaml.Controls.ContentPresenter _presenter;
+		TitleViewManager _titleViewManager;
+
+		public PageControl()
+		{
+			Style = Microsoft.UI.Xaml.Application.Current.Resources["MauiControlsPageControlStyle"] as Microsoft.UI.Xaml.Style;
+		}
+
+		public string BackButtonTitle
+		{
+			get { return (string)GetValue(BackButtonTitleProperty); }
+			set { SetValue(BackButtonTitleProperty, value); }
+		}
+
+		public double ContentHeight
+		{
+			get { return _presenter != null ? _presenter.ActualHeight : 0; }
+		}
+
+		public Microsoft.UI.Xaml.Thickness ContentMargin
+		{
+			get { return (Microsoft.UI.Xaml.Thickness)GetValue(ContentMarginProperty); }
+			set { SetValue(ContentMarginProperty, value); }
+		}
+
+		public double ContentWidth
+		{
+			get { return _presenter != null ? _presenter.ActualWidth : 0; }
+		}
+
+		public WBrush ToolbarBackground
+		{
+			get { return (WBrush)GetValue(ToolbarBackgroundProperty); }
+			set { SetValue(ToolbarBackgroundProperty, value); }
+		}
+
+        public ToolbarPlacement ToolbarPlacement
+        {
+            get { return _toolbarPlacement; }
+            set
+            {
+                _toolbarPlacement = value; 
+                _toolbarPlacementHelper.UpdateToolbarPlacement();
+            }
+        }
+
+		public bool ToolbarDynamicOverflowEnabled
+		{
+			get { return _toolbarDynamicOverflowEnabled; }
+			set
+			{
+				_toolbarDynamicOverflowEnabled = value;
+				UpdateToolbarDynamicOverflowEnabled();
+			}
+		}
+
+		public Visibility TitleVisibility
+		{
+			get { return (Visibility)GetValue(TitleVisibilityProperty); }
+			set { SetValue(TitleVisibilityProperty, value); }
+		}
+
+		public Visibility TitleViewVisibility
+		{
+			get { return (Visibility)GetValue(TitleViewVisibilityProperty); }
+			set { SetValue(TitleViewVisibilityProperty, value); }
+		}
+
+		public WBrush TitleBrush
+		{
+			get { return (WBrush)GetValue(TitleBrushProperty); }
+			set { SetValue(TitleBrushProperty, value); }
+		}
+
+		public double TitleInset
+		{
+			get { return (double)GetValue(TitleInsetProperty); }
+			set { SetValue(TitleInsetProperty, value); }
+		}
+
+		FrameworkElement ITitleViewRendererController.TitleViewPresenter => _titleViewPresenter;
+		CommandBar ITitleViewRendererController.CommandBar => _commandBar;
+
+		Task<CommandBar> IToolbarProvider.GetCommandBarAsync()
+		{
+			if (_commandBar != null)
+				return Task.FromResult(_commandBar);
+
+			_commandBarTcs = new TaskCompletionSource<CommandBar>();
+			ApplyTemplate();
+			return _commandBarTcs.Task;
+		}
+
+		protected override void OnApplyTemplate()
+		{
+			base.OnApplyTemplate();
+
+			_presenter = GetTemplateChild("presenter") as Microsoft.UI.Xaml.Controls.ContentPresenter;
+
+			_titleViewPresenter = GetTemplateChild("TitleViewPresenter") as FrameworkElement;
+
+			_commandBar = GetTemplateChild("CommandBar") as CommandBar;
+
+			_titleViewManager = new TitleViewManager(this);
+
+			_toolbarPlacementHelper.Initialize(_commandBar, () => ToolbarPlacement, GetTemplateChild);
+			UpdateToolbarDynamicOverflowEnabled();
+
+			TaskCompletionSource<CommandBar> tcs = _commandBarTcs;
+		    tcs?.SetResult(_commandBar);
+		}
+
+		static void OnTitleViewPropertyChanged(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs e)	
+		{	
+			((PageControl)dependencyObject)._titleViewManager?.OnTitleViewPropertyChanged();	
+		}
+		
+		void UpdateToolbarDynamicOverflowEnabled()
+		{
+			if (_commandBar != null)
+			{
+				_commandBar.IsDynamicOverflowEnabled = ToolbarDynamicOverflowEnabled;
+			}
+		}
+	}
+}
diff --git a/src/Controls/src/Core/Platform/Windows/PlatformConfigurationExtensions.cs b/src/Controls/src/Core/Platform/Windows/PlatformConfigurationExtensions.cs
new file mode 100644
index 000000000000..9db9dc4a228a
--- /dev/null
+++ b/src/Controls/src/Core/Platform/Windows/PlatformConfigurationExtensions.cs
@@ -0,0 +1,11 @@
+namespace Microsoft.Maui.Controls.Platform
+{
+	public static class PlatformConfigurationExtensions
+	{
+		public static IPlatformElementConfiguration<PlatformConfiguration.Windows, T> OnThisPlatform<T>(this T element) 
+			where T : Element, IElementConfiguration<T>
+		{
+			return (element).On<PlatformConfiguration.Windows>();
+		}
+	}
+}
diff --git a/src/Controls/src/Core/Platform/Windows/Styles/MauiControlsPageControlStyle.xaml b/src/Controls/src/Core/Platform/Windows/Styles/MauiControlsPageControlStyle.xaml
new file mode 100644
index 000000000000..eb296b37cda9
--- /dev/null
+++ b/src/Controls/src/Core/Platform/Windows/Styles/MauiControlsPageControlStyle.xaml
@@ -0,0 +1,54 @@
+<ResourceDictionary
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:uwp="using:Microsoft.Maui.Controls.Platform">
+
+	<Style TargetType="uwp:PageControl" x:Key="MauiControlsPageControlStyle">
+		<Setter Property="ContentMargin" Value="0" />
+		<Setter Property="TitleBrush" Value="{ThemeResource DefaultTextForegroundThemeBrush}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="uwp:PageControl">
+					<Grid Background="{TemplateBinding Background}">
+
+						<Grid.RowDefinitions>
+							<RowDefinition Height="Auto" />
+							<RowDefinition Height="*" />
+							<RowDefinition Height="Auto" />
+						</Grid.RowDefinitions>
+
+						<Border x:Name="TopCommandBarArea" HorizontalAlignment="Stretch" Background="{TemplateBinding ToolbarBackground}">
+							<uwp:MauiCommandBar x:Name="CommandBar" Background="{TemplateBinding ToolbarBackground}" MinHeight="{ThemeResource TitleBarHeight}" HorizontalAlignment="Stretch">
+								<uwp:MauiCommandBar.Content>
+									<Border x:Name="TitleArea" Height="{ThemeResource TitleBarHeight}" Visibility="{TemplateBinding TitleVisibility}" HorizontalAlignment="Stretch">
+										<Grid x:Name="TitleViewPresenter" VerticalAlignment="Center" Background="{TemplateBinding ToolbarBackground}" HorizontalAlignment="Stretch">
+
+											<Grid.ColumnDefinitions>
+												<ColumnDefinition Width="Auto"/>
+												<ColumnDefinition Width="Auto"/>
+												<ColumnDefinition Width="*"/>
+											</Grid.ColumnDefinitions>
+
+											<Image Grid.Column="0" Source="{TemplateBinding TitleIcon}" />
+
+											<Border Grid.Column="1" Height="{ThemeResource TitleBarHeight}" Visibility="{TemplateBinding TitleVisibility}">
+												<TextBlock Text="{Binding Title}" TextWrapping="NoWrap" VerticalAlignment="Center" Margin="10,0,0,0" Foreground="{TemplateBinding TitleBrush}" Style="{ThemeResource TitleTextBlockStyle}" />
+											</Border>
+
+											<ContentPresenter Grid.Column="2" Content="{Binding TitleView, RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={StaticResource ViewToRenderer}}" Visibility="{TemplateBinding TitleViewVisibility}" HorizontalAlignment="Stretch" />
+
+										</Grid>
+									</Border>
+								</uwp:MauiCommandBar.Content>
+							</uwp:MauiCommandBar>
+						</Border>
+
+						<uwp:MauiPresenter Margin="{TemplateBinding ContentMargin}" ContentTransitions="{TemplateBinding ContentTransitions}" x:Name="presenter" Grid.Row="1" />
+
+						<Border x:Name="BottomCommandBarArea" Grid.Row="2" HorizontalAlignment="Stretch"></Border>
+					</Grid>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+</ResourceDictionary> 
\ No newline at end of file
diff --git a/src/Controls/src/Core/Platform/Windows/Styles/Resources.xaml b/src/Controls/src/Core/Platform/Windows/Styles/Resources.xaml
new file mode 100644
index 000000000000..24b480ce625d
--- /dev/null
+++ b/src/Controls/src/Core/Platform/Windows/Styles/Resources.xaml
@@ -0,0 +1,10 @@
+<ResourceDictionary
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	x:Class="Microsoft.Maui.Controls.Platform.Resources">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="MauiControlsPageControlStyle.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+	
+</ResourceDictionary>
diff --git a/src/Controls/src/Core/Platform/Windows/TitleViewManager.cs b/src/Controls/src/Core/Platform/Windows/TitleViewManager.cs
new file mode 100644
index 000000000000..280a44363996
--- /dev/null
+++ b/src/Controls/src/Core/Platform/Windows/TitleViewManager.cs
@@ -0,0 +1,94 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using WVisibility = Microsoft.UI.Xaml.Visibility;
+
+namespace Microsoft.Maui.Controls.Platform
+{
+	internal class TitleViewManager
+	{
+		readonly ITitleViewRendererController _titleViewRendererController;
+
+		View TitleView => _titleViewRendererController.TitleView;
+		CommandBar CommandBar => _titleViewRendererController.CommandBar;
+		FrameworkElement TitleViewPresenter => _titleViewRendererController.TitleViewPresenter;
+
+		public TitleViewManager(ITitleViewRendererController titleViewRendererController)
+		{
+			_titleViewRendererController = titleViewRendererController;
+
+			if (TitleViewPresenter != null)
+			{
+				TitleViewPresenter.Loaded += OnTitleViewPresenterLoaded;
+			}
+
+			if (CommandBar != null)
+			{
+				CommandBar.LayoutUpdated += commandLayoutUpdated;
+				CommandBar.Unloaded += commandBarUnloaded;
+			}
+		}
+
+		internal void OnTitleViewPropertyChanged()
+		{
+			UpdateTitleViewWidth();
+		}
+
+		void OnTitleViewPresenterLoaded(object sender, RoutedEventArgs e)
+		{
+			UpdateTitleViewWidth();
+			if (TitleViewPresenter != null)
+			{
+				TitleViewPresenter.Loaded -= OnTitleViewPresenterLoaded;
+			}
+		}
+
+		void commandBarUnloaded(object sender, RoutedEventArgs e)
+		{
+			if (CommandBar != null)
+			{
+				CommandBar.LayoutUpdated -= commandLayoutUpdated;
+				CommandBar.Unloaded -= commandBarUnloaded;
+			}
+		}
+
+		void commandLayoutUpdated(object sender, object e)
+		{
+			UpdateTitleViewWidth();
+		}
+
+		void UpdateTitleViewWidth()
+		{
+			if (TitleView == null || TitleViewPresenter == null || CommandBar == null)
+				return;
+
+			if (CommandBar.ActualWidth <= 0)
+				return;
+
+			double buttonWidth = 0;
+
+			foreach (var item in CommandBar.GetDescendantsByName<Microsoft.UI.Xaml.Controls.Button>("MoreButton"))
+				if (item.Visibility == WVisibility.Visible)
+					buttonWidth += item.ActualWidth;
+
+			if (!CommandBar.IsDynamicOverflowEnabled)
+				foreach (var item in CommandBar.GetDescendantsByName<ItemsControl>("PrimaryItemsControl"))
+					buttonWidth += item.ActualWidth;
+
+			TitleViewPresenter.Width = CommandBar.ActualWidth - buttonWidth;
+			UpdateVisibility();
+		}
+
+		void UpdateVisibility()
+		{
+			if (TitleView == null)
+				_titleViewRendererController.TitleViewVisibility = Visibility.Collapsed;
+			else
+				_titleViewRendererController.TitleViewVisibility = Visibility.Visible;
+		}
+	}
+}
diff --git a/src/Controls/src/Core/Platform/Windows/ToolbarManager.cs b/src/Controls/src/Core/Platform/Windows/ToolbarManager.cs
new file mode 100644
index 000000000000..b8d346aade33
--- /dev/null
+++ b/src/Controls/src/Core/Platform/Windows/ToolbarManager.cs
@@ -0,0 +1,102 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.UI.Xaml.Controls;
+using WImage = Microsoft.UI.Xaml.Controls.Image;
+using NativeAutomationProperties = Microsoft.UI.Xaml.Automation.AutomationProperties;
+
+namespace Microsoft.Maui.Controls.Platform
+{
+	// TODO MAUI
+	// this needs to be fixed to handle multi page
+	static internal class ToolbarManager
+	{
+		static ToolbarTracker _toolbarTracker = new ToolbarTracker();
+		static ImageConverter _imageConverter = new ImageConverter();
+		static ImageSourceIconElementConverter _imageSourceIconElementConverter = new ImageSourceIconElementConverter();
+
+		static internal async Task UpdateToolbarItems(NavigationPage page)
+		{
+			_toolbarTracker.Target = page.CurrentPage;
+			var toolbarProvider = GetToolbarProvider(page);
+
+			if (toolbarProvider == null)
+			{
+				return;
+			}
+
+			var commandBar = await toolbarProvider.GetCommandBarAsync();
+
+			if (commandBar == null)
+			{
+				return;
+			}
+
+			commandBar.PrimaryCommands.Clear();
+			commandBar.SecondaryCommands.Clear();
+
+			var toolBarForegroundBinder = GetToolbarProvider(page) as IToolBarForegroundBinder;
+
+			foreach (ToolbarItem item in _toolbarTracker.ToolbarItems)
+			{
+				toolBarForegroundBinder?.BindForegroundColor(commandBar);
+
+				var button = new AppBarButton();
+				button.SetBinding(AppBarButton.LabelProperty, "Text");
+
+				if (commandBar.IsDynamicOverflowEnabled && item.Order == ToolbarItemOrder.Secondary)
+				{
+					button.SetBinding(AppBarButton.IconProperty, "IconImageSource", _imageSourceIconElementConverter);
+				}
+				else
+				{
+					var img = new WImage();
+					img.SetBinding(WImage.SourceProperty, "Value");
+					img.SetBinding(WImage.DataContextProperty, "IconImageSource", _imageConverter);
+					button.Content = img;
+				}
+
+				button.Command = new MenuItemCommand(item);
+				button.DataContext = item;
+				button.SetValue(NativeAutomationProperties.AutomationIdProperty, item.AutomationId);
+				button.SetAutomationPropertiesName(item);
+				button.SetAutomationPropertiesAccessibilityView(item);
+				button.SetAutomationPropertiesHelpText(item);
+
+				// TODO MAUI
+				button.SetAutomationPropertiesLabeledBy(item, null);
+
+				ToolbarItemOrder order = item.Order == ToolbarItemOrder.Default ? ToolbarItemOrder.Primary : item.Order;
+				if (order == ToolbarItemOrder.Primary)
+				{
+					toolBarForegroundBinder?.BindForegroundColor(button);
+					commandBar.PrimaryCommands.Add(button);
+				}
+				else
+				{
+					commandBar.SecondaryCommands.Add(button);
+				}
+			}
+		}
+
+		static internal IToolbarProvider GetToolbarProvider(Page page)
+		{
+			IToolbarProvider provider = null;
+			
+			Page element = page;
+			while (element != null)
+			{
+				provider = element.Handler as IToolbarProvider;
+				if (provider != null)
+					break;
+
+				var pageContainer = element as IPageContainer<Page>;
+				element = pageContainer?.CurrentPage;
+			}
+
+			return provider;
+		}
+
+	}
+}
diff --git a/src/Controls/src/Core/Platform/Windows/ToolbarPlacementHelper.cs b/src/Controls/src/Core/Platform/Windows/ToolbarPlacementHelper.cs
new file mode 100644
index 000000000000..bfa5086fb26d
--- /dev/null
+++ b/src/Controls/src/Core/Platform/Windows/ToolbarPlacementHelper.cs
@@ -0,0 +1,121 @@
+using System;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific;
+
+namespace Microsoft.Maui.Controls.Platform
+{
+	internal class ToolbarPlacementHelper
+	{
+		Border _bottomCommandBarArea;
+		CommandBar _commandBar;
+		Func<ToolbarPlacement> _getToolbarPlacement;
+		Border _titleArea;
+		Border _topCommandBarArea;
+
+		public void Initialize(CommandBar commandBar, Func<ToolbarPlacement> getToolbarPlacement,
+			Func<string, DependencyObject> getTemplateChild)
+		{
+			_commandBar = commandBar;
+			_getToolbarPlacement = getToolbarPlacement;
+			_bottomCommandBarArea = getTemplateChild("BottomCommandBarArea") as Border;
+			_topCommandBarArea = getTemplateChild("TopCommandBarArea") as Border;
+			_titleArea = getTemplateChild("TitleArea") as Border;
+
+			if (_commandBar != null && _bottomCommandBarArea != null && _topCommandBarArea != null)
+			{
+				// We have to wait for the command bar to load so that it'll be in the control hierarchy
+				// otherwise we can't properly move it to wherever the toolbar is supposed to be
+				_commandBar.Loaded += (sender, args) =>
+				{
+					UpdateToolbarPlacement();
+					UpdateIsInValidLocation();
+				};
+			}
+		}
+
+		public void UpdateToolbarPlacement()
+		{
+			if (_commandBar == null || _getToolbarPlacement == null || _bottomCommandBarArea == null ||
+			    _topCommandBarArea == null)
+			{
+				// Template hasn't been applied yet, so we're not ready to update the toolbar placement
+				return;
+			}
+
+			UpdateToolbarPlacement(_commandBar, _getToolbarPlacement(), _bottomCommandBarArea, _topCommandBarArea, _titleArea);
+		}
+
+		static void UpdateToolbarPlacement(CommandBar toolbar, ToolbarPlacement toolbarPlacement, Border bottomCommandBarArea,
+			Border topCommandBarArea, Border titleArea)
+		{
+			// Figure out what's hosting the command bar right now
+			var current = toolbar.Parent as Border;
+
+			// And figure out where it should be
+			Border target;
+
+			switch (toolbarPlacement)
+			{
+				case ToolbarPlacement.Top:
+					target = topCommandBarArea;
+					break;
+				case ToolbarPlacement.Bottom:
+					target = bottomCommandBarArea;
+					break;
+				case ToolbarPlacement.Default:
+				default:
+					target = Device.Idiom == TargetIdiom.Phone ? bottomCommandBarArea : topCommandBarArea;
+					break;
+			}
+
+			if (current == null || target == null || current == target)
+			{
+				return;
+			}
+
+			// Remove the command bar from its current host and add it to the new one
+			current.Child = null;
+			target.Child = toolbar;
+
+			if (titleArea != null)
+			{
+				if (target == bottomCommandBarArea)
+				{
+					// If the title is hosted in the command bar and we're moving the command bar to the bottom,
+					// put the title into the topCommandBarArea
+					toolbar.Content = null;
+					topCommandBarArea.Child = titleArea;
+				}
+				else
+				{
+					// Put the title back into the command bar
+					toolbar.Content = titleArea;
+				}
+			}
+		}
+
+		// For the time being, keeping this logic for dealing with consistency between the platforms
+		// re: toolbar visibility here; at some point we should be separating toolbars from navigation bars,
+		// and this won't be necessary
+		bool _shouldShowToolBar;
+		public bool ShouldShowToolBar
+		{
+			get { return _shouldShowToolBar; }
+			set
+			{
+				_shouldShowToolBar = value;
+				UpdateIsInValidLocation();
+			}
+		}
+
+		void UpdateIsInValidLocation()
+		{
+			var MauiCommandBar = _commandBar as MauiCommandBar;
+			if (MauiCommandBar != null)
+			{
+				MauiCommandBar.IsInValidLocation = ShouldShowToolBar;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/src/Core/Platform/Windows/VisualElementTracker.cs b/src/Controls/src/Core/Platform/Windows/VisualElementTracker.cs
new file mode 100644
index 000000000000..4bae91ec9bc0
--- /dev/null
+++ b/src/Controls/src/Core/Platform/Windows/VisualElementTracker.cs
@@ -0,0 +1,906 @@
+#nullable enable
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Linq;
+using System.Threading.Tasks;
+using Windows.ApplicationModel.DataTransfer;
+using Windows.Graphics.Imaging;
+using Windows.Storage.Streams;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Hosting;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Media.Imaging;
+using Microsoft.Maui.Controls.Internals;
+using WCompositeTransform = Microsoft.UI.Xaml.Media.CompositeTransform;
+using WScaleTransform = Microsoft.UI.Xaml.Media.ScaleTransform;
+using Microsoft.Maui.Graphics;
+using WVisibility = Microsoft.UI.Xaml.Visibility;
+
+namespace Microsoft.Maui.Controls.Platform
+{
+	// TODO MAUI: can we convert this over to using IView
+	public class VisualElementTracker<TElement, TNativeElement> : IDisposable where TElement : VisualElement where TNativeElement : FrameworkElement
+	{
+		readonly NotifyCollectionChangedEventHandler _collectionChangedHandler;
+		readonly List<uint> _fingers = new List<uint>();
+		FrameworkElement? _container;
+		TNativeElement? _control;
+		TElement? _element;
+
+		bool _invalidateArrangeNeeded = false;
+
+		bool _isDisposed = false;
+		bool _isPanning = false;
+		bool _isSwiping = false;
+		bool _isPinching = false;
+		bool _wasPanGestureStartedSent = false;
+		bool _wasPinchGestureStartedSent = false;
+		public event EventHandler? Updated;
+
+		static bool HasClip;
+
+		public VisualElementTracker()
+		{
+			_collectionChangedHandler = ModelGestureRecognizersOnCollectionChanged;
+		}
+
+		public FrameworkElement? Container
+		{
+			get { return _container; }
+			set
+			{
+				if (_container == value)
+					return;
+
+				ClearContainerEventHandlers();
+
+				_container = value;
+
+				UpdatingGestureRecognizers();
+
+				UpdateNativeControl();
+			}
+		}
+
+		public bool PreventGestureBubbling { get; set; }
+
+		public TNativeElement? Control
+		{
+			get { return _control; }
+			set
+			{
+				if (_control == value)
+					return;
+
+				if (_control != null)
+				{
+					_control.Tapped -= HandleTapped;
+					_control.DoubleTapped -= HandleDoubleTapped;
+				}
+
+				_control = value;
+				UpdateNativeControl();
+
+				if (PreventGestureBubbling)
+				{
+					UpdatingGestureRecognizers();
+				}
+			}
+		}
+
+		void SendEventArgs<TRecognizer>(Action<TRecognizer> func)
+		{
+			if (_container == null && _control == null)
+				return;
+
+			var view = Element as View;
+			var gestures =
+				view?
+					.GestureRecognizers?
+					.OfType<TRecognizer>();
+
+			if (gestures == null)
+				return;
+
+			foreach (var gesture in gestures)
+			{
+				func(gesture);
+			}
+		}
+
+		void HandleDragLeave(object sender, Microsoft.UI.Xaml.DragEventArgs e)
+		{
+			var package = e.DataView.Properties["_XFPropertes_DONTUSE"] as DataPackage;
+			var dragEventArgs = new DragEventArgs(package);
+
+			dragEventArgs.AcceptedOperation = (DataPackageOperation)((int)dragEventArgs.AcceptedOperation);
+			SendEventArgs<DropGestureRecognizer>(rec =>
+			{
+				if (!rec.AllowDrop)
+				{
+					return;
+				}
+
+				var operationPriorToSend = dragEventArgs.AcceptedOperation;
+				rec.SendDragLeave(dragEventArgs);
+
+				// If you set the AcceptedOperation to a value it was already set to
+				// it causes the related animation to remain visible when the dragging component leaves
+				// for example
+				// e.AcceptedOperation = Windows.ApplicationModel.DataTransfer.DataPackageOperation.Copy;
+				// Even if AcceptedOperation is already set to Copy it will cause the copy animation
+				// to remain even after the the dragged element has left
+				if (operationPriorToSend != dragEventArgs.AcceptedOperation)
+				{
+					var result = (int)dragEventArgs.AcceptedOperation;
+					e.AcceptedOperation = (Windows.ApplicationModel.DataTransfer.DataPackageOperation)result;
+				}
+			});
+		}
+
+		void HandleDragOver(object sender, Microsoft.UI.Xaml.DragEventArgs e)
+		{
+			var package = e.DataView.Properties["_XFPropertes_DONTUSE"] as DataPackage;
+			var dragEventArgs = new DragEventArgs(package);
+
+			SendEventArgs<DropGestureRecognizer>(rec =>
+			{
+				if(!rec.AllowDrop)
+				{
+					e.AcceptedOperation = Windows.ApplicationModel.DataTransfer.DataPackageOperation.None;
+					return;
+				}
+
+				rec.SendDragOver(dragEventArgs);
+				var result = (int)dragEventArgs.AcceptedOperation;
+				e.AcceptedOperation = (Windows.ApplicationModel.DataTransfer.DataPackageOperation)result;
+			});
+		}
+
+		void HandleDropCompleted(UIElement sender, Microsoft.UI.Xaml.DropCompletedEventArgs e)
+		{
+			var args = new DropCompletedEventArgs();
+			SendEventArgs<DragGestureRecognizer>(rec => rec.SendDropCompleted(args));
+		}
+
+		void HandleDrop(object sender, Microsoft.UI.Xaml.DragEventArgs e)
+		{
+			var datapackage = e.DataView.Properties["_XFPropertes_DONTUSE"] as DataPackage;
+
+			var args = new DropEventArgs(datapackage?.View);
+			SendEventArgs<DropGestureRecognizer>(async rec =>
+			{
+				if (!rec.AllowDrop)
+					return;
+
+				try
+				{
+					await rec.SendDrop(args);
+				}
+				catch (Exception dropExc)
+				{
+					Internals.Log.Warning(nameof(DropGestureRecognizer), $"{dropExc}");
+				}
+			});
+		}
+
+		void HandleDragStarting(UIElement sender, Microsoft.UI.Xaml.DragStartingEventArgs e)
+		{
+			SendEventArgs<DragGestureRecognizer>(rec =>
+			{
+				if (!rec.CanDrag)
+				{
+					e.Cancel = true;
+					return;
+				}
+
+				var renderer = sender as IViewHandler;
+				var args = rec.SendDragStarting(renderer?.VirtualView);
+				e.Data.Properties["_XFPropertes_DONTUSE"] = args.Data;
+
+				if (!args.Handled && renderer != null)
+				{
+					if (renderer.NativeView is Microsoft.UI.Xaml.Controls.Image nativeImage &&
+						nativeImage.Source is BitmapImage bi && bi.UriSource != null)
+					{
+						e.Data.SetBitmap(RandomAccessStreamReference.CreateFromUri(bi.UriSource));
+					}
+					else if(!String.IsNullOrWhiteSpace(args.Data.Text))
+					{
+						Uri? uri;
+						if (Uri.TryCreate(args.Data.Text, UriKind.Absolute, out uri))
+						{
+							if (args.Data.Text.StartsWith("http", StringComparison.OrdinalIgnoreCase))
+								e.Data.SetWebLink(uri);
+							else
+								e.Data.SetApplicationLink(uri);
+						}
+						else
+						{
+							e.Data.SetText(args.Data.Text);
+						}
+					}
+				}
+
+				e.Cancel = args.Cancel;
+				e.AllowedOperations = Windows.ApplicationModel.DataTransfer.DataPackageOperation.Copy;
+			});
+		}
+
+		public TElement? Element
+		{
+			get { return _element; }
+			set
+			{
+				if (_element == value)
+					return;
+
+				if (_element != null)
+				{
+					_element.BatchCommitted -= OnRedrawNeeded;
+					_element.PropertyChanged -= OnPropertyChanged;
+
+					var view = _element as View;
+					if (view != null)
+					{
+						var oldRecognizers = (ObservableCollection<IGestureRecognizer>)view.GestureRecognizers;
+						oldRecognizers.CollectionChanged -= _collectionChangedHandler;
+						var gestures = (view as IGestureController)?.CompositeGestureRecognizers as ObservableCollection<IGestureRecognizer>;
+
+						if(gestures != null)
+							gestures.CollectionChanged -= _collectionChangedHandler;
+					}
+				}
+
+				_element = value;
+
+				if (_element != null)
+				{
+					_element.BatchCommitted += OnRedrawNeeded;
+					_element.PropertyChanged += OnPropertyChanged;
+
+					var view = _element as View;
+					if (view != null)
+					{
+						var newRecognizers = (ObservableCollection<IGestureRecognizer>)view.GestureRecognizers;
+						newRecognizers.CollectionChanged += _collectionChangedHandler;
+
+						var gestures = (view as IGestureController)?.CompositeGestureRecognizers as ObservableCollection<IGestureRecognizer>;
+						if (gestures != null)
+							gestures.CollectionChanged += _collectionChangedHandler;
+					}
+				}
+
+				UpdateNativeControl();
+			}
+		}
+
+		public void Dispose()
+		{
+			Dispose(true);
+			GC.SuppressFinalize(this);
+		}
+
+		void ClearContainerEventHandlers()
+		{
+			if (_container != null)
+			{
+				_container.DragStarting -= HandleDragStarting;
+				_container.DropCompleted -= HandleDropCompleted;
+				_container.DragOver -= HandleDragOver;
+				_container.Drop -= HandleDrop;
+				_container.Tapped -= OnTap;
+				_container.DoubleTapped -= OnDoubleTap;
+				_container.ManipulationDelta -= OnManipulationDelta;
+				_container.ManipulationStarted -= OnManipulationStarted;
+				_container.ManipulationCompleted -= OnManipulationCompleted;
+				_container.PointerPressed -= OnPointerPressed;
+				_container.PointerExited -= OnPointerExited;
+				_container.PointerReleased -= OnPointerReleased;
+				_container.PointerCanceled -= OnPointerCanceled;
+			}
+		}
+
+		protected virtual void Dispose(bool disposing)
+		{
+			if (_isDisposed)
+				return;
+
+			_isDisposed = true;
+
+			if (!disposing)
+				return;
+
+			ClearContainerEventHandlers();
+
+			if (_element != null)
+			{
+				_element.BatchCommitted -= OnRedrawNeeded;
+				_element.PropertyChanged -= OnPropertyChanged;
+
+				var view = _element as View;
+				if (view != null)
+				{
+					var oldRecognizers = (ObservableCollection<IGestureRecognizer>)view.GestureRecognizers;
+					oldRecognizers.CollectionChanged -= _collectionChangedHandler;
+				}
+			}
+
+			if (_control != null)
+			{
+				_control.Tapped -= HandleTapped;
+				_control.DoubleTapped -= HandleDoubleTapped;
+			}
+
+			Control = null;
+			Element = null;
+			Container = null;
+		}
+
+		protected virtual void OnPropertyChanged(object? sender, PropertyChangedEventArgs e)
+		{
+			if (Element == null)
+				return;
+
+			if (Element.Batched)
+			{
+				if (e.PropertyName == VisualElement.XProperty.PropertyName || e.PropertyName == VisualElement.YProperty.PropertyName || e.PropertyName == VisualElement.WidthProperty.PropertyName ||
+					e.PropertyName == VisualElement.HeightProperty.PropertyName)
+				{
+					_invalidateArrangeNeeded = true;
+				}
+				return;
+			}
+
+			if (Container == null)
+				return;
+
+			if (e.PropertyName == VisualElement.XProperty.PropertyName || e.PropertyName == VisualElement.YProperty.PropertyName || e.PropertyName == VisualElement.WidthProperty.PropertyName ||
+				e.PropertyName == VisualElement.HeightProperty.PropertyName)
+			{
+				MaybeInvalidate();
+			}
+
+
+			if (e.PropertyName == VisualElement.AnchorXProperty.PropertyName || e.PropertyName == VisualElement.AnchorYProperty.PropertyName)
+			{
+				UpdateScaleAndRotation(Element, Container);
+			}
+			else if (e.PropertyName == VisualElement.ScaleProperty.PropertyName || e.PropertyName == VisualElement.ScaleXProperty.PropertyName || e.PropertyName == VisualElement.ScaleYProperty.PropertyName)
+			{
+				UpdateScaleAndRotation(Element, Container);
+			}
+			else if (e.PropertyName == VisualElement.TranslationXProperty.PropertyName || e.PropertyName == VisualElement.TranslationYProperty.PropertyName ||
+					 e.PropertyName == VisualElement.RotationProperty.PropertyName || e.PropertyName == VisualElement.RotationXProperty.PropertyName || e.PropertyName == VisualElement.RotationYProperty.PropertyName)
+			{
+				UpdateRotation(Element, Container);
+			}
+			else if (e.PropertyName == VisualElement.IsVisibleProperty.PropertyName)
+			{
+				UpdateVisibility(Element, Container);
+			}
+			else if (e.PropertyName == VisualElement.OpacityProperty.PropertyName)
+			{
+				UpdateOpacity(Element, Container);
+			}
+			else if (e.PropertyName == VisualElement.InputTransparentProperty.PropertyName)
+			{
+				UpdateInputTransparent(Element, Container);
+			}
+			else if (e.PropertyName == VisualElement.IsEnabledProperty.PropertyName)
+			{
+				UpdateInputTransparent(Element, Container);
+			}
+			else if (e.PropertyName == VisualElement.ClipProperty.PropertyName)
+			{
+				UpdateClip(Element, Container);
+			}
+		}
+
+		protected virtual void UpdateNativeControl()
+		{
+			if (Element == null || Container == null)
+				return;
+
+			UpdateVisibility(Element, Container);
+			UpdateOpacity(Element, Container);
+			UpdateScaleAndRotation(Element, Container);
+			UpdateInputTransparent(Element, Container);
+			UpdateClip(Element, Container);
+
+			if (_invalidateArrangeNeeded)
+			{
+				MaybeInvalidate();
+			}
+			_invalidateArrangeNeeded = false;
+
+			OnUpdated();
+		}
+
+		void HandleSwipe(ManipulationDeltaRoutedEventArgs e, View view)
+		{
+			if (_fingers.Count > 1 || view == null)
+				return;
+
+			_isSwiping = true;
+
+			foreach (SwipeGestureRecognizer recognizer in view.GestureRecognizers.GetGesturesFor<SwipeGestureRecognizer>())
+			{
+				((ISwipeGestureController)recognizer).SendSwipe(view, e.Delta.Translation.X + e.Cumulative.Translation.X, e.Delta.Translation.Y + e.Cumulative.Translation.Y);
+			}
+		}
+
+		void HandlePan(ManipulationDeltaRoutedEventArgs e, View view)
+		{
+			if (view == null)
+				return;
+
+			_isPanning = true;
+
+			foreach (PanGestureRecognizer recognizer in view.GestureRecognizers.GetGesturesFor<PanGestureRecognizer>().Where(g => g.TouchPoints == _fingers.Count))
+			{
+				if (!_wasPanGestureStartedSent)
+				{
+					recognizer.SendPanStarted(view, Application.Current.PanGestureId);
+				}
+				recognizer.SendPan(view, e.Delta.Translation.X + e.Cumulative.Translation.X, e.Delta.Translation.Y + e.Cumulative.Translation.Y, Application.Current.PanGestureId);
+			}
+			_wasPanGestureStartedSent = true;
+		}
+
+		void HandlePinch(ManipulationDeltaRoutedEventArgs e, View view)
+		{
+			if (_fingers.Count < 2 || view == null)
+				return;
+
+			_isPinching = true;
+
+			Windows.Foundation.Point translationPoint = e.Container.TransformToVisual(Container).TransformPoint(e.Position);
+
+			var scaleOriginPoint = new Point(translationPoint.X / view.Width, translationPoint.Y / view.Height);
+			IEnumerable<PinchGestureRecognizer> pinchGestures = view.GestureRecognizers.GetGesturesFor<PinchGestureRecognizer>();
+			foreach (PinchGestureRecognizer recognizer in pinchGestures)
+			{
+				if (!_wasPinchGestureStartedSent)
+				{
+					recognizer.SendPinchStarted(view, scaleOriginPoint);
+				}
+				recognizer.SendPinch(view, e.Delta.Scale, scaleOriginPoint);
+			}
+			_wasPinchGestureStartedSent = true;
+		}
+
+		void MaybeInvalidate()
+		{
+			if (Element?.IsInNativeLayout == true)
+				return;
+
+			var parent = (FrameworkElement?)Container?.Parent;
+			parent?.InvalidateMeasure();
+			Container?.InvalidateMeasure();
+		}
+
+		void ModelGestureRecognizersOnCollectionChanged(object? sender, NotifyCollectionChangedEventArgs notifyCollectionChangedEventArgs)
+		{
+			UpdatingGestureRecognizers();
+		}
+
+		void OnDoubleTap(object sender, DoubleTappedRoutedEventArgs e)
+		{
+			var view = Element as View;
+			if (view == null)
+				return;
+
+			var tapPosition = e.GetPosition(Control);
+			var children = (view as IGestureController)?.GetChildElements(new Point(tapPosition.X, tapPosition.Y));
+
+			if (children != null)
+				foreach (var recognizer in children.GetChildGesturesFor<TapGestureRecognizer>(g => g.NumberOfTapsRequired == 1 || g.NumberOfTapsRequired == 2))
+				{
+					recognizer.SendTapped(view);
+					e.Handled = true;
+				}
+
+			if (e.Handled)
+				return;
+
+			IEnumerable<TapGestureRecognizer> doubleTapGestures = view.GestureRecognizers.GetGesturesFor<TapGestureRecognizer>(g => g.NumberOfTapsRequired == 1 || g.NumberOfTapsRequired == 2);
+			foreach (TapGestureRecognizer recognizer in doubleTapGestures)
+			{
+				recognizer.SendTapped(view);
+				e.Handled = true;
+			}
+		}
+
+		void OnManipulationCompleted(object sender, ManipulationCompletedRoutedEventArgs e)
+		{
+			SwipeComplete(true);
+			PinchComplete(true);
+			PanComplete(true);
+		}
+
+		void OnManipulationDelta(object sender, ManipulationDeltaRoutedEventArgs e)
+		{
+			var view = Element as View;
+			if (view == null)
+				return;
+			HandleSwipe(e, view);
+			HandlePinch(e, view);
+			HandlePan(e, view);
+		}
+
+		void OnManipulationStarted(object sender, ManipulationStartedRoutedEventArgs e)
+		{
+			var view = Element as View;
+			if (view == null)
+				return;
+			_wasPinchGestureStartedSent = false;
+			_wasPanGestureStartedSent = false;
+		}
+
+		void OnPointerCanceled(object sender, PointerRoutedEventArgs e)
+		{
+			uint id = e.Pointer.PointerId;
+			if (_fingers.Contains(id))
+				_fingers.Remove(id);
+			SwipeComplete(false);
+			PinchComplete(false);
+			PanComplete(false);
+		}
+
+		void OnPointerExited(object sender, PointerRoutedEventArgs e)
+		{
+			uint id = e.Pointer.PointerId;
+			if (_fingers.Contains(id))
+				_fingers.Remove(id);
+			SwipeComplete(true);
+			PinchComplete(true);
+			PanComplete(true);
+		}
+
+		void OnPointerPressed(object sender, PointerRoutedEventArgs e)
+		{
+			uint id = e.Pointer.PointerId;
+			if (!_fingers.Contains(id))
+				_fingers.Add(id);
+		}
+
+		void OnPointerReleased(object? sender, PointerRoutedEventArgs e)
+		{
+			uint id = e.Pointer.PointerId;
+			if (_fingers.Contains(id))
+				_fingers.Remove(id);
+			SwipeComplete(true);
+			PinchComplete(true);
+			PanComplete(true);
+		}
+
+		void OnRedrawNeeded(object? sender, EventArgs e)
+		{
+			UpdateNativeControl();
+		}
+
+		void OnTap(object? sender, TappedRoutedEventArgs e)
+		{
+			var view = Element as View;
+			if (view == null)
+				return;
+
+			var tapPosition = e.GetPosition(Control);
+			var children = (view as IGestureController)?.GetChildElements(new Point(tapPosition.X, tapPosition.Y));
+
+			if (children != null)
+				foreach (var recognizer in children.GetChildGesturesFor<TapGestureRecognizer>(g => g.NumberOfTapsRequired == 1))
+				{
+					recognizer.SendTapped(view);
+					e.Handled = true;
+				}
+
+			if (e.Handled)
+				return;
+
+			IEnumerable<TapGestureRecognizer> tapGestures = view.GestureRecognizers.GetGesturesFor<TapGestureRecognizer>(g => g.NumberOfTapsRequired == 1);
+			foreach (var recognizer in tapGestures)
+			{
+				recognizer.SendTapped(view);
+				e.Handled = true;
+			}
+		}
+
+		void SwipeComplete(bool success)
+		{
+			var view = Element as View;
+			if (view == null || !_isSwiping)
+				return;
+
+			if (success)
+			{
+				foreach (SwipeGestureRecognizer recognizer in view.GestureRecognizers.GetGesturesFor<SwipeGestureRecognizer>())
+				{
+					((ISwipeGestureController)recognizer).DetectSwipe(view, recognizer.Direction);
+				}
+			}
+
+			_isSwiping = false;
+		}
+
+		void OnUpdated()
+		{
+			if (Updated != null)
+				Updated(this, EventArgs.Empty);
+		}
+
+		void PanComplete(bool success)
+		{
+			var view = Element as View;
+			if (view == null || !_isPanning)
+				return;
+
+			foreach (PanGestureRecognizer recognizer in view.GestureRecognizers.GetGesturesFor<PanGestureRecognizer>().Where(g => g.TouchPoints == _fingers.Count))
+			{
+				if (success)
+				{
+					recognizer.SendPanCompleted(view, Application.Current.PanGestureId);
+				}
+				else
+				{
+					recognizer.SendPanCanceled(view, Application.Current.PanGestureId);
+				}
+			}
+
+			Application.Current.PanGestureId++;
+			_isPanning = false;
+		}
+
+		void PinchComplete(bool success)
+		{
+			var view = Element as View;
+			if (view == null || !_isPinching)
+				return;
+
+			IEnumerable<PinchGestureRecognizer> pinchGestures = view.GestureRecognizers.GetGesturesFor<PinchGestureRecognizer>();
+			foreach (PinchGestureRecognizer recognizer in pinchGestures)
+			{
+				if (success)
+				{
+					recognizer.SendPinchEnded(view);
+				}
+				else
+				{
+					recognizer.SendPinchCanceled(view);
+				}
+			}
+
+			_isPinching = false;
+		}
+
+		static void UpdateInputTransparent(VisualElement view, FrameworkElement frameworkElement)
+		{
+			if (view is Layout)
+			{
+				// Let VisualElementRenderer handle this
+			}
+
+			frameworkElement.IsHitTestVisible = view.IsEnabled && !view.InputTransparent;
+		}
+
+		static void UpdateClip(VisualElement view, FrameworkElement frameworkElement)
+		{
+			if (!ShouldUpdateClip(view, frameworkElement))
+				return;
+
+			var geometry = view.Clip;
+
+			HasClip = geometry != null;
+
+			if (CompositionHelper.IsCompositionGeometryTypePresent)
+				frameworkElement.ClipVisual(geometry);
+			else
+				frameworkElement.Clip(geometry);
+		}
+
+		static bool ShouldUpdateClip(VisualElement view, FrameworkElement frameworkElement)
+		{
+			if (view == null || frameworkElement == null)
+				return false;
+
+			var formsGeometry = view.Clip;
+
+			if (formsGeometry != null)
+				return true;
+
+			if (formsGeometry == null && HasClip)
+				return true;
+
+			return false;
+		}
+
+		static void UpdateOpacity(VisualElement view, FrameworkElement frameworkElement)
+		{
+			frameworkElement.Opacity = view.Opacity;
+		}
+
+		static void UpdateRotation(VisualElement view, FrameworkElement frameworkElement)
+		{
+			double anchorX = view.AnchorX;
+			double anchorY = view.AnchorY;
+			double rotationX = view.RotationX;
+			double rotationY = view.RotationY;
+			double rotation = view.Rotation;
+			double translationX = view.TranslationX;
+			double translationY = view.TranslationY;
+			double scaleX = view.Scale * view.ScaleX;
+			double scaleY = view.Scale * view.ScaleY;
+
+			if (rotationX % 360 == 0 && rotationY % 360 == 0 && rotation % 360 == 0 && translationX == 0 && translationY == 0 && scaleX == 1 && scaleY == 1)
+			{
+				frameworkElement.Projection = null;
+				frameworkElement.RenderTransform = null;
+			}
+			else
+			{
+				// PlaneProjection removes touch and scrollwheel functionality on scrollable views such
+				// as ScrollView, ListView, and TableView. If neither RotationX or RotationY are set
+				// (i.e. their absolute value is 0), a CompositeTransform is instead used to allow for
+				// rotation of the control on a 2D plane, and the other values are set. Otherwise, the
+				// rotation values are set, but the aforementioned functionality will be lost.
+				if (Math.Abs(view.RotationX) != 0 || Math.Abs(view.RotationY) != 0)
+				{
+					frameworkElement.Projection = new PlaneProjection
+					{
+						CenterOfRotationX = anchorX,
+						CenterOfRotationY = anchorY,
+						GlobalOffsetX = translationX,
+						GlobalOffsetY = translationY,
+						RotationX = -rotationX,
+						RotationY = -rotationY,
+						RotationZ = -rotation
+					};
+				}
+				else
+				{
+					frameworkElement.RenderTransform = new WCompositeTransform
+					{
+						CenterX = anchorX,
+						CenterY = anchorY,
+						Rotation = rotation,
+						ScaleX = scaleX,
+						ScaleY = scaleY,
+						TranslateX = translationX,
+						TranslateY = translationY
+					};
+				}
+			}
+		}
+
+		static void UpdateScaleAndRotation(VisualElement view, FrameworkElement frameworkElement)
+		{
+			double anchorX = view.AnchorX;
+			double anchorY = view.AnchorY;
+			frameworkElement.RenderTransformOrigin = new Windows.Foundation.Point(anchorX, anchorY);
+			frameworkElement.RenderTransform = new WScaleTransform { ScaleX = view.Scale * view.ScaleX, ScaleY = view.Scale * view.ScaleY };
+
+			UpdateRotation(view, frameworkElement);
+		}
+
+		static void UpdateVisibility(VisualElement view, FrameworkElement frameworkElement)
+		{
+			frameworkElement.Visibility = view.IsVisible ? WVisibility.Visible : WVisibility.Collapsed;
+		}
+
+		void UpdateDragAndDropGestureRecognizers()
+		{
+			if (_container == null)
+				return;
+
+			var view = Element as View;
+			IList<IGestureRecognizer>? gestures = view?.GestureRecognizers;
+
+			if (gestures == null)
+				return;
+
+			_container.CanDrag = gestures.GetGesturesFor<DragGestureRecognizer>()
+				.FirstOrDefault()?.CanDrag ?? false;
+
+			_container.AllowDrop = gestures.GetGesturesFor<DropGestureRecognizer>()
+				.FirstOrDefault()?.AllowDrop ?? false;
+
+			if (_container.CanDrag)
+			{
+				_container.DragStarting += HandleDragStarting;
+				_container.DropCompleted += HandleDropCompleted;
+			}
+
+			if(_container.AllowDrop)
+			{
+				_container.DragOver += HandleDragOver;
+				_container.Drop += HandleDrop;
+				_container.DragLeave += HandleDragLeave;
+			}
+		}
+
+		void UpdatingGestureRecognizers()
+		{
+			var view = Element as View;
+			IList<IGestureRecognizer>? gestures = view?.GestureRecognizers;
+
+			if (_container == null || gestures == null)
+				return;
+
+			ClearContainerEventHandlers();
+			UpdateDragAndDropGestureRecognizers();
+
+			var children = (view as IGestureController)?.GetChildElements(Point.Zero);
+			IList<TapGestureRecognizer>? childGestures = children?.GetChildGesturesFor<TapGestureRecognizer>().ToList();
+
+			if (gestures.GetGesturesFor<TapGestureRecognizer>(g => g.NumberOfTapsRequired == 1).Any()
+				|| children?.GetChildGesturesFor<TapGestureRecognizer>(g => g.NumberOfTapsRequired == 1).Any() == true)
+			{
+				_container.Tapped += OnTap;
+			}
+			else
+			{
+				if (_control != null && PreventGestureBubbling)
+				{
+					_control.Tapped += HandleTapped;
+				}
+			}
+
+			if (gestures.GetGesturesFor<TapGestureRecognizer>(g => g.NumberOfTapsRequired == 1 || g.NumberOfTapsRequired == 2).Any()
+				|| children?.GetChildGesturesFor<TapGestureRecognizer>(g => g.NumberOfTapsRequired == 1 || g.NumberOfTapsRequired == 2).Any() == true)
+			{
+				_container.DoubleTapped += OnDoubleTap;
+			}
+			else
+			{
+				if (_control != null && PreventGestureBubbling)
+				{
+					_control.DoubleTapped += HandleDoubleTapped;
+				}
+			}
+
+			bool hasSwipeGesture = gestures.GetGesturesFor<SwipeGestureRecognizer>().GetEnumerator().MoveNext();
+			bool hasPinchGesture = gestures.GetGesturesFor<PinchGestureRecognizer>().GetEnumerator().MoveNext();
+			bool hasPanGesture = gestures.GetGesturesFor<PanGestureRecognizer>().GetEnumerator().MoveNext();
+			if (!hasSwipeGesture && !hasPinchGesture && !hasPanGesture)
+				return;
+
+			//We can't handle ManipulationMode.Scale and System , so we don't support pinch/pan on a scrollview 
+			if (Element is ScrollView)
+			{
+				if (hasPinchGesture)
+					Log.Warning("Gestures", "PinchGestureRecognizer is not supported on a ScrollView in Windows Platforms");
+				if (hasPanGesture)
+					Log.Warning("Gestures", "PanGestureRecognizer is not supported on a ScrollView in Windows Platforms");
+				if (hasSwipeGesture)
+					Log.Warning("Gestures", "SwipeGestureRecognizer is not supported on a ScrollView in Windows Platforms");
+				return;
+			}
+
+			_container.ManipulationMode = ManipulationModes.Scale | ManipulationModes.TranslateX | ManipulationModes.TranslateY;
+			_container.ManipulationDelta += OnManipulationDelta;
+			_container.ManipulationStarted += OnManipulationStarted;
+			_container.ManipulationCompleted += OnManipulationCompleted;
+			_container.PointerPressed += OnPointerPressed;
+			_container.PointerExited += OnPointerExited;
+			_container.PointerReleased += OnPointerReleased;
+			_container.PointerCanceled += OnPointerCanceled;
+		}
+
+		void HandleTapped(object sender, TappedRoutedEventArgs tappedRoutedEventArgs)
+		{
+			tappedRoutedEventArgs.Handled = true;
+		}
+
+		void HandleDoubleTapped(object sender, DoubleTappedRoutedEventArgs doubleTappedRoutedEventArgs)
+		{
+			doubleTappedRoutedEventArgs.Handled = true;
+		}
+	}
+}
diff --git a/src/Controls/src/Core/Platform/iOS/ControlsNavigationController.cs b/src/Controls/src/Core/Platform/iOS/ControlsNavigationController.cs
new file mode 100644
index 000000000000..bd78fa299ad5
--- /dev/null
+++ b/src/Controls/src/Core/Platform/iOS/ControlsNavigationController.cs
@@ -0,0 +1,249 @@
+//#nullable enable
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Foundation;
+using Microsoft.Maui.Controls.Handlers;
+using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Handlers;
+using ObjCRuntime;
+using UIKit;
+
+namespace Microsoft.Maui.Controls.Platform
+{
+	public class ControlsNavigationController : UINavigationController
+	{
+		readonly NavigationPageHandler _handler;
+		Dictionary<UIViewController, TaskCompletionSource<bool>> _completionTasks =
+							new Dictionary<UIViewController, TaskCompletionSource<bool>>();
+		TaskCompletionSource<bool> _popCompletionTask;
+
+		// This holds the view controllers for each page
+		readonly Dictionary<IPage, INativeViewHandler> _trackers =
+			new Dictionary<IPage, INativeViewHandler>();
+
+		IReadOnlyList<Page> NavigationStack => _handler.VirtualView.Navigation.NavigationStack;
+
+		public ControlsNavigationController(NavigationPageHandler handler) : base()
+		{
+			Delegate = new NavDelegate(this);
+			_handler = handler;
+		}
+
+		public ControlsNavigationController(NavigationPageHandler handler, Type navigationBarType, Type toolbarType)
+			: base(navigationBarType, toolbarType)
+		{
+			Delegate = new NavDelegate(this);
+			_handler = handler;
+		}
+
+		[Export("navigationBar:shouldPopItem:")]
+		[Microsoft.Maui.Controls.Internals.Preserve(Conditional = true)]
+		public bool ShouldPopItem(UINavigationBar navigationBar, UINavigationItem item) =>
+			SendPop();
+
+		internal bool SendPop()
+		{
+			// this means the pop is already done, nothing we can do
+			if (ViewControllers.Length < NavigationBar.Items.Length)
+				return true;
+
+			//foreach (var tracker in _trackers)
+			//{
+			//	if (tracker.Value.ViewController == TopViewController)
+			//	{
+			//		var behavior = Shell.GetBackButtonBehavior(tracker.Value.Page);
+			//		var command = behavior.GetPropertyIfSet<ICommand>(BackButtonBehavior.CommandProperty, null);
+			//		var commandParameter = behavior.GetPropertyIfSet<object>(BackButtonBehavior.CommandParameterProperty, null);
+
+			//		if (command != null)
+			//		{
+			//			if (command.CanExecute(commandParameter))
+			//			{
+			//				command.Execute(commandParameter);
+			//			}
+
+			//			return false;
+			//		}
+
+			//		break;
+			//	}
+			//}
+
+			//bool allowPop = ShouldPop();
+			bool allowPop = true;
+
+			if (allowPop)
+			{
+				// Do not remove, wonky behavior on some versions of iOS if you dont dispatch
+				CoreFoundation.DispatchQueue.MainQueue.DispatchAsync(() =>
+				{
+					_popCompletionTask = new TaskCompletionSource<bool>();
+					SendPoppedOnCompletion(_popCompletionTask.Task);
+					PopViewController(true);
+				});
+			}
+			else
+			{
+				for (int i = 0; i < NavigationBar.Subviews.Length; i++)
+				{
+					var child = NavigationBar.Subviews[i];
+					if (child.Alpha != 1)
+						UIView.Animate(.2f, () => child.Alpha = 1);
+				}
+			}
+
+			return false;
+		}
+
+
+		async void SendPoppedOnCompletion(Task popTask)
+		{
+			if (popTask == null)
+			{
+				throw new ArgumentNullException(nameof(popTask));
+			}
+
+			var poppedPage = NavigationStack[NavigationStack.Count - 1];
+			_handler.SendPopping(popTask);
+
+			await popTask;
+
+			DisposePage(poppedPage);
+		}
+
+		void DisposePage(IPage page, bool calledFromDispose = false)
+		{
+			if (_trackers.TryGetValue(page, out var tracker))
+			{
+				if (!calledFromDispose && tracker.ViewController != null && ViewControllers.Contains(tracker.ViewController))
+					ViewControllers = ViewControllers.Remove(_trackers[page].ViewController);
+
+				_trackers.Remove(page);
+			}
+		}
+
+		internal async Task OnPopRequestedAsync(NavigationRequestedEventArgs e)
+		{
+			var page = e.Page;
+			var animated = e.Animated;
+
+			_popCompletionTask = new TaskCompletionSource<bool>();
+			e.Task = _popCompletionTask.Task;
+
+			PopViewController(animated);
+
+			await _popCompletionTask.Task;
+
+			DisposePage(page);
+		}
+
+		internal void LoadPages(IMauiContext mauiContext)
+		{
+			foreach (var page in NavigationStack)
+				PushPage(page, false, mauiContext);
+		}
+
+		internal void OnPushRequested(NavigationRequestedEventArgs e, IMauiContext mauiContext)
+		{
+			var page = e.Page;
+			var animated = e.Animated;
+
+			var taskSource = new TaskCompletionSource<bool>();
+			PushPage(page, animated, mauiContext, taskSource);
+
+			e.Task = taskSource.Task;
+		}
+
+
+		void PushPage(IPage page, bool animated, IMauiContext mauiContext, TaskCompletionSource<bool> completionSource = null)
+		{
+			var viewController = page.ToUIViewController(mauiContext);
+			var handler = (INativeViewHandler)page.Handler;
+
+			_trackers[page] = handler;
+
+			if (completionSource != null)
+				_completionTasks[viewController] = completionSource;
+
+			PushViewController(viewController, animated);
+		}
+
+		IPage ElementForViewController(UIViewController viewController)
+		{
+			foreach (var child in _trackers)
+			{
+				if (child.Value.ViewController == viewController)
+					return child.Key;
+			}
+
+			return null;
+		}
+
+
+		class NavDelegate : UINavigationControllerDelegate
+		{
+			readonly ControlsNavigationController _self;
+
+			public NavDelegate(ControlsNavigationController renderer)
+			{
+				_self = renderer;
+			}
+
+			// This is currently working around a Mono Interpreter bug
+			// if you remove this code please verify that hot restart still works
+			// https://github.com/xamarin/Microsoft.Maui.Controls.Compatibility/issues/10519
+			[Export("navigationController:animationControllerForOperation:fromViewController:toViewController:")]
+			[Foundation.Preserve(Conditional = true)]
+			public new IUIViewControllerAnimatedTransitioning GetAnimationControllerForOperation(UINavigationController navigationController, UINavigationControllerOperation operation, UIViewController fromViewController, UIViewController toViewController)
+			{
+				return null;
+			}
+
+			public override void DidShowViewController(UINavigationController navigationController, [Transient] UIViewController viewController, bool animated)
+			{
+				var tasks = _self._completionTasks;
+				var popTask = _self._popCompletionTask;
+
+				if (tasks.TryGetValue(viewController, out var source))
+				{
+					source.TrySetResult(true);
+					tasks.Remove(viewController);
+				}
+				else if (popTask != null)
+				{
+					popTask.TrySetResult(true);
+				}
+			}
+
+			public override void WillShowViewController(UINavigationController navigationController, [Transient] UIViewController viewController, bool animated)
+			{
+				var element = _self.ElementForViewController(viewController);
+
+				bool navBarVisible = true;
+
+				if (element is BindableObject bo)
+					navBarVisible = NavigationPage.GetHasNavigationBar(bo);
+
+				navigationController.SetNavigationBarHidden(!navBarVisible, true);
+
+				var coordinator = viewController.GetTransitionCoordinator();
+				if (coordinator != null && coordinator.IsInteractive)
+				{
+					// handle swipe to dismiss gesture 
+					coordinator.NotifyWhenInteractionChanges(OnInteractionChanged);
+				}
+			}
+
+			void OnInteractionChanged(IUIViewControllerTransitionCoordinatorContext context)
+			{
+				if (!context.IsCancelled)
+				{
+					_self._popCompletionTask = new TaskCompletionSource<bool>();
+					_self.SendPoppedOnCompletion(_self._popCompletionTask.Task);
+				}
+			}
+		}
+	}
+}
diff --git a/src/Compatibility/Core/src/iOS/Extensions/BrushExtensions.cs b/src/Controls/src/Core/Platform/iOS/Extensions/BrushExtensions.cs
similarity index 78%
rename from src/Compatibility/Core/src/iOS/Extensions/BrushExtensions.cs
rename to src/Controls/src/Core/Platform/iOS/Extensions/BrushExtensions.cs
index 760aa29f41da..f31723868f14 100644
--- a/src/Compatibility/Core/src/iOS/Extensions/BrushExtensions.cs
+++ b/src/Controls/src/Core/Platform/iOS/Extensions/BrushExtensions.cs
@@ -1,9 +1,12 @@
+using System.Collections.Generic;
 using System.Linq;
 using CoreAnimation;
 using CoreGraphics;
+using Foundation;
+using Microsoft.Maui.Graphics;
 using UIKit;
 
-namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
+namespace Microsoft.Maui.Controls.Platform
 {
 	public static partial class BrushExtensions
 	{
@@ -120,7 +123,7 @@ public static UIImage GetBackgroundImage(this UIView control, Brush brush)
 
 			backgroundLayer.RenderInContext(UIGraphics.GetCurrentContext());
 			UIImage gradientImage = UIGraphics.GetImageFromCurrentImageContext();
-			UIGraphics.EndImageContext(); 
+			UIGraphics.EndImageContext();
 
 			return gradientImage;
 		}
@@ -191,6 +194,59 @@ static void UpdateBackgroundLayer(this CALayer layer, CGRect bounds)
 			}
 		}
 
+		static CGPoint GetRadialGradientBrushEndPoint(Point startPoint, double radius)
+		{
+			double x = startPoint.X == 1 ? (startPoint.X - radius) : (startPoint.X + radius);
+
+			if (x < 0)
+				x = 0;
+
+			if (x > 1)
+				x = 1;
+
+			double y = startPoint.Y == 1 ? (startPoint.Y - radius) : (startPoint.Y + radius);
+
+			if (y < 0)
+				y = 0;
+
+			if (y > 1)
+				y = 1;
+
+			return new CGPoint(x, y);
+		}
+
+		static NSNumber[] GetCAGradientLayerLocations(List<GradientStop> gradientStops)
+		{
+			if (gradientStops == null || gradientStops.Count == 0)
+				return new NSNumber[0];
+
+			if (gradientStops.Count > 1 && gradientStops.Any(gt => gt.Offset != 0))
+				return gradientStops.Select(x => new NSNumber(x.Offset)).ToArray();
+			else
+			{
+				int itemCount = gradientStops.Count;
+				int index = 0;
+				float step = 1.0f / itemCount;
+
+				NSNumber[] locations = new NSNumber[itemCount];
+
+				foreach (var gradientStop in gradientStops)
+				{
+					float location = step * index;
+					bool setLocation = !gradientStops.Any(gt => gt.Offset > location);
+
+					if (gradientStop.Offset == 0 && setLocation)
+						locations[index] = new NSNumber(location);
+					else
+						locations[index] = new NSNumber(gradientStop.Offset);
+
+					index++;
+				}
+
+				return locations;
+			}
+		}
+
 		static bool ShouldUseParentView(UIView view)
 		{
 			if (view is UILabel)
diff --git a/src/Controls/src/Core/PlatformConfiguration/WindowsSpecific/Application.cs b/src/Controls/src/Core/PlatformConfiguration/WindowsSpecific/Application.cs
index 7a39fd08df2b..cfcdc33a476f 100644
--- a/src/Controls/src/Core/PlatformConfiguration/WindowsSpecific/Application.cs
+++ b/src/Controls/src/Core/PlatformConfiguration/WindowsSpecific/Application.cs
@@ -1,11 +1,13 @@
 namespace Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific
 {
+	using Microsoft.Extensions.DependencyInjection;
 	using FormsElement = Maui.Controls.Application;
 
 	public static class Application
 	{
 		public static readonly BindableProperty ImageDirectoryProperty =
-			BindableProperty.Create("ImageDirectory", typeof(string), typeof(FormsElement), string.Empty);
+			BindableProperty.Create("ImageDirectory", typeof(string), typeof(FormsElement), string.Empty,
+				propertyChanged: OnImageDirectoryChanged);
 
 		public static void SetImageDirectory(BindableObject element, string value)
 		{
@@ -28,5 +30,13 @@ public static IPlatformElementConfiguration<Windows, FormsElement> SetImageDirec
 			config.Element.SetValue(ImageDirectoryProperty, value);
 			return config;
 		}
+
+		static void OnImageDirectoryChanged(BindableObject bindable, object oldValue, object newValue)
+		{
+#if WINDOWS
+			var config = MauiWinUIApplication.Current.Services.GetService<IImageSourceServiceConfiguration>();
+			config?.SetImageDirectory(newValue?.ToString());
+#endif
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/src/Core/Properties/AssemblyInfo.cs b/src/Controls/src/Core/Properties/AssemblyInfo.cs
index 7d2e3010c426..3f445ea1db11 100644
--- a/src/Controls/src/Core/Properties/AssemblyInfo.cs
+++ b/src/Controls/src/Core/Properties/AssemblyInfo.cs
@@ -5,7 +5,10 @@
 
 [assembly: InternalsVisibleTo("iOSUnitTests")]
 [assembly: InternalsVisibleTo("Microsoft.Maui.Controls.Compatibility.ControlGallery")]
-[assembly: InternalsVisibleTo("Microsoft.Maui.Controls")]
+[assembly: InternalsVisibleTo("Microsoft.Maui.Controls.Compatibility")]
+[assembly: InternalsVisibleTo("Microsoft.Maui.Controls.Compatibility.Android")]
+[assembly: InternalsVisibleTo("Microsoft.Maui.Controls.Compatibility.iOS")]
+[assembly: InternalsVisibleTo("Microsoft.Maui.Controls.Compatibility.Windows")]
 [assembly: InternalsVisibleTo("Microsoft.Maui.Controls.Core.Design")]
 [assembly: InternalsVisibleTo("Microsoft.Maui.Controls.Core.UnitTests")]
 [assembly: InternalsVisibleTo("Microsoft.Maui.Controls.Android.UnitTests")]
diff --git a/src/Controls/src/Core/PropertyChangedEventArgsExtensions.cs b/src/Controls/src/Core/PropertyChangedEventArgsExtensions.cs
new file mode 100644
index 000000000000..b22b66838deb
--- /dev/null
+++ b/src/Controls/src/Core/PropertyChangedEventArgsExtensions.cs
@@ -0,0 +1,48 @@
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Maui.Controls
+{
+	internal static class PropertyChangedEventArgsExtensions
+	{
+		[MethodImpl(MethodImplOptions.AggressiveInlining)]
+		public static bool Is(this PropertyChangedEventArgs args, BindableProperty property)
+		{
+			return args.PropertyName == property.PropertyName;
+		}
+
+		[MethodImpl(MethodImplOptions.AggressiveInlining)]
+		public static bool IsOneOf(this PropertyChangedEventArgs args, BindableProperty p0, BindableProperty p1)
+		{
+			return args.PropertyName == p0.PropertyName ||
+				args.PropertyName == p1.PropertyName;
+		}
+
+		[MethodImpl(MethodImplOptions.AggressiveInlining)]
+		public static bool IsOneOf(this PropertyChangedEventArgs args, BindableProperty p0, BindableProperty p1, BindableProperty p2)
+		{
+			return args.PropertyName == p0.PropertyName ||
+				args.PropertyName == p1.PropertyName ||
+				args.PropertyName == p2.PropertyName;
+		}
+
+		[MethodImpl(MethodImplOptions.AggressiveInlining)]
+		public static bool IsOneOf(this PropertyChangedEventArgs args, BindableProperty p0, BindableProperty p1, BindableProperty p2, BindableProperty p3)
+		{
+			return args.PropertyName == p0.PropertyName ||
+				args.PropertyName == p1.PropertyName ||
+				args.PropertyName == p2.PropertyName ||
+				args.PropertyName == p3.PropertyName;
+		}
+
+		[MethodImpl(MethodImplOptions.AggressiveInlining)]
+		public static bool IsOneOf(this PropertyChangedEventArgs args, BindableProperty p0, BindableProperty p1, BindableProperty p2, BindableProperty p3, BindableProperty p4)
+		{
+			return args.PropertyName == p0.PropertyName ||
+				args.PropertyName == p1.PropertyName ||
+				args.PropertyName == p2.PropertyName ||
+				args.PropertyName == p3.PropertyName ||
+				args.PropertyName == p4.PropertyName;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Controls/src/Core/RadioButton.cs b/src/Controls/src/Core/RadioButton.cs
index d250e514b971..342270455692 100644
--- a/src/Controls/src/Core/RadioButton.cs
+++ b/src/Controls/src/Core/RadioButton.cs
@@ -5,7 +5,7 @@
 
 namespace Microsoft.Maui.Controls
 {
-	public class RadioButton : TemplatedView, IElementConfiguration<RadioButton>, ITextElement, IFontElement, IBorderElement
+	public partial class RadioButton : TemplatedView, IElementConfiguration<RadioButton>, ITextElement, IFontElement, IBorderElement
 	{
 		public const string CheckedVisualState = "Checked";
 		public const string UncheckedVisualState = "Unchecked";
diff --git a/src/Controls/src/Core/ReferenceTypeConverter.cs b/src/Controls/src/Core/ReferenceTypeConverter.cs
index 159ef77fdb11..76461ccbd62b 100644
--- a/src/Controls/src/Core/ReferenceTypeConverter.cs
+++ b/src/Controls/src/Core/ReferenceTypeConverter.cs
@@ -1,4 +1,5 @@
 using System;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Maui.Controls.Internals;
 using Microsoft.Maui.Controls.Xaml;
 using Microsoft.Maui.Controls.Xaml.Internals;
diff --git a/src/Controls/src/Core/Registrar.cs b/src/Controls/src/Core/Registrar.cs
index a885fa37992b..b90fba5aa1b4 100644
--- a/src/Controls/src/Core/Registrar.cs
+++ b/src/Controls/src/Core/Registrar.cs
@@ -5,7 +5,6 @@
 using System.Reflection;
 using Microsoft.Maui.Controls.StyleSheets;
 
-
 namespace Microsoft.Maui.Controls
 {
 	[Flags]
@@ -51,7 +50,6 @@ public void Register(Type tview, Type trender, Type[] supportedVisuals, short pr
 					visualRenderers[supportedVisuals[i]] = (trender, priority);
 			}
 
-
 			// This registers a factory into the Handler version of the registrar.
 			// This way if you are running a .NET MAUI app but want to use legacy renderers
 			// the Handler.Registrar will use this factory to resolve a RendererToHandlerShim for the given type
@@ -135,7 +133,6 @@ public TOut GetHandlerForObject<TOut>(object obj, params object[] args) where TO
 			return GetHandler(type, obj, (obj as IVisualController)?.EffectiveVisual, args) as TOut;
 		}
 
-
 		public Type GetHandlerType(Type viewType) => GetHandlerType(viewType, _defaultVisualType);
 
 		public Type GetHandlerType(Type viewType, Type visualType)
@@ -266,9 +263,8 @@ static Registrar()
 			Registered = new Registrar<IRegisterable>();
 		}
 
-		public static IFontRegistrar FontRegistrar { get; } = new FontRegistrar();
-
 		internal static Dictionary<string, Type> Effects { get; } = new Dictionary<string, Type>();
+
 		internal static Dictionary<string, IList<StylePropertyAttribute>> StyleProperties => LazyStyleProperties.Value;
 
 		static bool DisableCSS = false;
@@ -342,7 +338,6 @@ public static void RegisterAll(Type[] attrTypes)
 			RegisterAll(attrTypes, default(InitializationFlags));
 		}
 
-
 		public static void RegisterAll(Type[] attrTypes, InitializationFlags flags)
 		{
 			RegisterAll(
@@ -395,7 +390,7 @@ public static void RegisterAll(
 						var attribute = a as HandlerAttribute;
 						if (attribute == null && (a is ExportFontAttribute fa))
 						{
-							FontRegistrar.Register(fa.FontFileName, fa.Alias, assembly);
+							CompatServiceProvider.FontRegistrar.Register(fa.FontFileName, fa.Alias, assembly);
 						}
 						else
 						{
@@ -427,12 +422,9 @@ public static void RegisterAll(
 				Profile.FrameEnd(frameName);
 			}
 
-			if (FontRegistrar is FontRegistrar fontRegistrar)
-			{
-				var type = Registered.GetHandlerType(typeof(EmbeddedFont));
-				if (type != null)
-					fontRegistrar.SetFontLoader((IEmbeddedFontLoader)Activator.CreateInstance(type));
-			}
+			var type = Registered.GetHandlerType(typeof(EmbeddedFont));
+			if (type != null)
+				CompatServiceProvider.SetFontLoader(type);
 
 			RegisterStylesheets(flags);
 			Profile.FramePartition("DependencyService.Initialize");
@@ -441,4 +433,4 @@ public static void RegisterAll(
 			Profile.FrameEnd();
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/src/Controls/src/Core/StreamImageSource.cs b/src/Controls/src/Core/StreamImageSource.cs
index 2282592a1a62..2b9a678ebd78 100644
--- a/src/Controls/src/Core/StreamImageSource.cs
+++ b/src/Controls/src/Core/StreamImageSource.cs
@@ -5,7 +5,7 @@
 
 namespace Microsoft.Maui.Controls
 {
-	public class StreamImageSource : ImageSource, IStreamImageSource
+	public partial class StreamImageSource : ImageSource, IStreamImageSource
 	{
 		public static readonly BindableProperty StreamProperty = BindableProperty.Create("Stream", typeof(Func<CancellationToken, Task<Stream>>), typeof(StreamImageSource),
 			default(Func<CancellationToken, Task<Stream>>));
@@ -27,7 +27,7 @@ protected override void OnPropertyChanged(string propertyName)
 
 		async Task<Stream> IStreamImageSource.GetStreamAsync(CancellationToken userToken)
 		{
-			if (Stream == null)
+			if (IsEmpty)
 				return null;
 
 			OnLoadingStarted();
diff --git a/src/Controls/src/Core/Internals/ToolbarTracker.cs b/src/Controls/src/Core/ToolbarTracker.cs
similarity index 97%
rename from src/Controls/src/Core/Internals/ToolbarTracker.cs
rename to src/Controls/src/Core/ToolbarTracker.cs
index 008ea7b2fee2..3cb1b525b399 100644
--- a/src/Controls/src/Core/Internals/ToolbarTracker.cs
+++ b/src/Controls/src/Core/ToolbarTracker.cs
@@ -4,11 +4,11 @@
 using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Linq;
+using Microsoft.Maui.Controls.Internals;
 
-namespace Microsoft.Maui.Controls.Internals
+namespace Microsoft.Maui.Controls
 {
-	[EditorBrowsable(EditorBrowsableState.Never)]
-	public class ToolbarTracker
+	internal class ToolbarTracker
 	{
 		int _flyoutDetails;
 		Page _target;
diff --git a/src/Controls/src/Core/UriImageSource.cs b/src/Controls/src/Core/UriImageSource.cs
index 2596d0b261be..92435a359942 100644
--- a/src/Controls/src/Core/UriImageSource.cs
+++ b/src/Controls/src/Core/UriImageSource.cs
@@ -9,14 +9,15 @@
 
 namespace Microsoft.Maui.Controls
 {
-	public sealed class UriImageSource : ImageSource
+	public sealed partial class UriImageSource : ImageSource, IStreamImageSource
 	{
 		internal const string CacheName = "ImageLoaderCache";
 
 		public static readonly BindableProperty UriProperty = BindableProperty.Create("Uri", typeof(Uri), typeof(UriImageSource), default(Uri),
 			propertyChanged: (bindable, oldvalue, newvalue) => ((UriImageSource)bindable).OnUriChanged(), validateValue: (bindable, value) => value == null || ((Uri)value).IsAbsoluteUri);
 
-		static readonly Microsoft.Maui.Controls.Internals.IIsolatedStorageFile Store = Device.PlatformServices.GetUserStoreForApplication();
+		// https://github.com/dotnet/runtime/issues/52332
+		// static readonly Microsoft.Maui.Controls.Internals.IIsolatedStorageFile Store = Device.PlatformServices.GetUserStoreForApplication();
 
 		static readonly object s_syncHandle = new object();
 		static readonly Dictionary<string, LockingSemaphore> s_semaphores = new Dictionary<string, LockingSemaphore>();
@@ -27,8 +28,8 @@ public sealed class UriImageSource : ImageSource
 
 		static UriImageSource()
 		{
-			if (!Store.GetDirectoryExistsAsync(CacheName).Result)
-				Store.CreateDirectoryAsync(CacheName).Wait();
+			/*if (!Store.GetDirectoryExistsAsync(CacheName).Result)
+				Store.CreateDirectoryAsync(CacheName).Wait();*/
 		}
 
 		public override bool IsEmpty => Uri == null;
@@ -49,7 +50,11 @@ public TimeSpan CacheValidity
 
 		public bool CachingEnabled
 		{
-			get { return _cachingEnabled; }
+			get
+			{
+				return false;
+				//return _cachingEnabled; 
+			}
 			set
 			{
 				if (_cachingEnabled == value)
@@ -68,9 +73,11 @@ public Uri Uri
 			set { SetValue(UriProperty, value); }
 		}
 
-		[EditorBrowsable(EditorBrowsableState.Never)]
-		public async Task<Stream> GetStreamAsync(CancellationToken userToken = default(CancellationToken))
+		async Task<Stream> IStreamImageSource.GetStreamAsync(CancellationToken userToken)
 		{
+			if (IsEmpty)
+				return null;
+
 			OnLoadingStarted();
 			userToken.Register(CancellationTokenSource.Cancel);
 			Stream stream;
@@ -104,21 +111,22 @@ static string GetCacheKey(Uri uri)
 			return Device.PlatformServices.GetHash(uri.AbsoluteUri);
 		}
 
-		async Task<bool> GetHasLocallyCachedCopyAsync(string key, bool checkValidity = true)
+		Task<bool> GetHasLocallyCachedCopyAsync(string key, bool checkValidity = true)
 		{
-			DateTime now = DateTime.UtcNow;
-			DateTime? lastWriteTime = await GetLastWriteTimeUtcAsync(key).ConfigureAwait(false);
-			return lastWriteTime.HasValue && now - lastWriteTime.Value < CacheValidity;
+			return Task.FromResult(false);
+			//DateTime now = DateTime.UtcNow;
+			//DateTime? lastWriteTime = await GetLastWriteTimeUtcAsync(key).ConfigureAwait(false);
+			//return lastWriteTime.HasValue && now - lastWriteTime.Value < CacheValidity;
 		}
 
-		static async Task<DateTime?> GetLastWriteTimeUtcAsync(string key)
-		{
-			string path = IOPath.Combine(CacheName, key);
-			if (!await Store.GetFileExistsAsync(path).ConfigureAwait(false))
-				return null;
+		//static async Task<DateTime?> GetLastWriteTimeUtcAsync(string key)
+		//{
+		//	string path = IOPath.Combine(CacheName, key);
+		//	if (!await Store.GetFileExistsAsync(path).ConfigureAwait(false))
+		//		return null;
 
-			return (await Store.GetLastWriteTimeAsync(path).ConfigureAwait(false)).UtcDateTime;
-		}
+		//	return (await Store.GetLastWriteTimeAsync(path).ConfigureAwait(false)).UtcDateTime;
+		//}
 
 		async Task<Stream> GetStreamAsync(Uri uri, CancellationToken cancellationToken = default(CancellationToken))
 		{
@@ -147,31 +155,31 @@ async Task<bool> GetHasLocallyCachedCopyAsync(string key, bool checkValidity = t
 
 		async Task<Stream> GetStreamAsyncUnchecked(string key, Uri uri, CancellationToken cancellationToken)
 		{
-			if (await GetHasLocallyCachedCopyAsync(key).ConfigureAwait(false))
-			{
-				var retry = 5;
-				while (retry >= 0)
-				{
-					int backoff;
-					try
-					{
-						Stream result = await Store.OpenFileAsync(IOPath.Combine(CacheName, key), FileMode.Open, FileAccess.Read).ConfigureAwait(false);
-						return result;
-					}
-					catch (IOException)
-					{
-						// iOS seems to not like 2 readers opening the file at the exact same time, back off for random amount of time
-						backoff = new Random().Next(1, 5);
-						retry--;
-					}
-
-					if (backoff > 0)
-					{
-						await Task.Delay(backoff);
-					}
-				}
-				return null;
-			}
+			//if (await GetHasLocallyCachedCopyAsync(key).ConfigureAwait(false))
+			//{
+			//	var retry = 5;
+			//	while (retry >= 0)
+			//	{
+			//		int backoff;
+			//		try
+			//		{
+			//			Stream result = await Store.OpenFileAsync(IOPath.Combine(CacheName, key), FileMode.Open, FileAccess.Read).ConfigureAwait(false);
+			//			return result;
+			//		}
+			//		catch (IOException)
+			//		{
+			//			// iOS seems to not like 2 readers opening the file at the exact same time, back off for random amount of time
+			//			backoff = new Random().Next(1, 5);
+			//			retry--;
+			//		}
+
+			//		if (backoff > 0)
+			//		{
+			//			await Task.Delay(backoff);
+			//		}
+			//	}
+			//	return null;
+			//}
 
 			Stream stream;
 			try
@@ -192,22 +200,24 @@ async Task<Stream> GetStreamAsyncUnchecked(string key, Uri uri, CancellationToke
 				return null;
 			}
 
-			try
-			{
-				Stream writeStream = await Store.OpenFileAsync(IOPath.Combine(CacheName, key), FileMode.Create, FileAccess.Write).ConfigureAwait(false);
-				await stream.CopyToAsync(writeStream, 16384, cancellationToken).ConfigureAwait(false);
-				if (writeStream != null)
-					writeStream.Dispose();
-
-				stream.Dispose();
+			return stream;
 
-				return await Store.OpenFileAsync(IOPath.Combine(CacheName, key), FileMode.Open, FileAccess.Read).ConfigureAwait(false);
-			}
-			catch (Exception ex)
-			{
-				Log.Warning("Image Loading", $"Error getting stream for {Uri}: {ex}");
-				return null;
-			}
+			//try
+			//{
+			//	Stream writeStream = await Store.OpenFileAsync(IOPath.Combine(CacheName, key), FileMode.Create, FileAccess.Write).ConfigureAwait(false);
+			//	await stream.CopyToAsync(writeStream, 16384, cancellationToken).ConfigureAwait(false);
+			//	if (writeStream != null)
+			//		writeStream.Dispose();
+
+			//	stream.Dispose();
+
+			//	return await Store.OpenFileAsync(IOPath.Combine(CacheName, key), FileMode.Open, FileAccess.Read).ConfigureAwait(false);
+			//}
+			//catch (Exception ex)
+			//{
+			//	Log.Warning("Image Loading", $"Error getting stream for {Uri}: {ex}");
+			//	return null;
+			//}
 		}
 
 		async Task<Stream> GetStreamFromCacheAsync(Uri uri, CancellationToken cancellationToken)
diff --git a/src/Controls/src/Core/View.cs b/src/Controls/src/Core/View.cs
index e7bedab4ad60..0290211ad7fb 100644
--- a/src/Controls/src/Core/View.cs
+++ b/src/Controls/src/Core/View.cs
@@ -186,6 +186,17 @@ void ValidateGesture(IGestureRecognizer gesture)
 		Primitives.LayoutAlignment IFrameworkElement.HorizontalLayoutAlignment => HorizontalOptions.ToCore();
 		Primitives.LayoutAlignment IFrameworkElement.VerticalLayoutAlignment => VerticalOptions.ToCore();
 
+		protected override void OnSizeAllocated(double width, double height)
+		{
+			base.OnSizeAllocated(width, height);
+
+			if (width >= 0 && height >= 0)
+			{
+				// This is a temporary measure to keep the old layouts working 
+				Handler?.NativeArrange(Bounds);
+			}
+		}
+
 		#endregion
 
 		#region HotReload
@@ -212,6 +223,6 @@ void IHotReloadableView.Reload()
 				//TODO: if reload handler is null, Do a manual reload?
 			});
 		}
-#endregion
+		#endregion
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/src/Core/ViewExtensions.cs b/src/Controls/src/Core/ViewExtensions.cs
index fcbe5780b4e6..74b18c26ed65 100644
--- a/src/Controls/src/Core/ViewExtensions.cs
+++ b/src/Controls/src/Core/ViewExtensions.cs
@@ -184,24 +184,24 @@ internal static IEnumerable<Element> GetParentsPath(this Element self)
 			}
 		}
 
-		internal static string GetStringValue(this Element element)
+		internal static string GetStringValue(this IView element)
 		{
 			string text = null;
-			if (element is Label label)
+			if (element is ILabel label)
 				text = label.Text;
-			else if (element is Entry entry)
+			else if (element is IEntry entry)
 				text = entry.Text;
-			else if (element is Editor editor)
+			else if (element is IEditor editor)
 				text = editor.Text;
-			else if (element is TimePicker tp)
+			else if (element is ITimePicker tp)
 				text = tp.Time.ToString();
-			else if (element is DatePicker dp)
+			else if (element is IDatePicker dp)
 				text = dp.Date.ToString();
-			else if (element is CheckBox cb)
+			else if (element is ICheckBox cb)
 				text = cb.IsChecked.ToString();
-			else if (element is Switch sw)
-				text = sw.IsToggled.ToString();
-			else if (element is RadioButton rb)
+			else if (element is ISwitch sw)
+				text = sw.IsOn.ToString();
+			else if (element is IRadioButton rb)
 				text = rb.IsChecked.ToString();
 
 			return text;
diff --git a/src/Controls/src/Core/VisibilityExtensions.cs b/src/Controls/src/Core/VisibilityExtensions.cs
new file mode 100644
index 000000000000..2b315a986094
--- /dev/null
+++ b/src/Controls/src/Core/VisibilityExtensions.cs
@@ -0,0 +1,13 @@
+namespace Microsoft.Maui.Controls
+{
+	public static class VisibilityExtensions
+	{
+		public static Visibility ToVisibility(this bool isVisible)
+		{
+			if (isVisible)
+				return Visibility.Visible;
+
+			return Visibility.Collapsed;
+		}
+	}
+}
diff --git a/src/Controls/src/Core/VisualElement.cs b/src/Controls/src/Core/VisualElement.cs
index 4d30a21a4dd9..e57b1ccc1731 100644
--- a/src/Controls/src/Core/VisualElement.cs
+++ b/src/Controls/src/Core/VisualElement.cs
@@ -939,7 +939,15 @@ internal virtual void OnIsPlatformEnabledChanged()
 		{
 		}
 
-		internal virtual void OnIsVisibleChanged(bool oldValue, bool newValue) => InvalidateMeasureInternal(InvalidationTrigger.Undefined);
+		internal virtual void OnIsVisibleChanged(bool oldValue, bool newValue)
+		{
+			if (this is IFrameworkElement fe)
+			{
+				fe.Handler?.UpdateValue(nameof(IFrameworkElement.Visibility));
+			}
+
+			InvalidateMeasureInternal(InvalidationTrigger.Undefined);
+		}
 
 		internal override void OnParentResourcesChanged(IEnumerable<KeyValuePair<string, object>> values)
 		{
@@ -1080,6 +1088,13 @@ static void OnRequestChanged(BindableObject bindable, object oldvalue, object ne
 			}
 
 			element.SelfConstraint = constraint;
+
+			if (element is IFrameworkElement fe)
+			{
+				fe.Handler?.UpdateValue(nameof(IFrameworkElement.Width));
+				fe.Handler?.UpdateValue(nameof(IFrameworkElement.Height));
+			}
+
 			((VisualElement)bindable).InvalidateMeasureInternal(InvalidationTrigger.SizeRequestChanged);
 		}
 
diff --git a/src/Compatibility/Core/src/WinUI/VisualElementChangedEventArgs.cs b/src/Controls/src/Core/VisualElementChangedEventArgs.cs
similarity index 90%
rename from src/Compatibility/Core/src/WinUI/VisualElementChangedEventArgs.cs
rename to src/Controls/src/Core/VisualElementChangedEventArgs.cs
index f795933f94c6..e20f8f17af8c 100644
--- a/src/Compatibility/Core/src/WinUI/VisualElementChangedEventArgs.cs
+++ b/src/Controls/src/Core/VisualElementChangedEventArgs.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Microsoft.Maui.Controls.Compatibility.Platform.UWP
+namespace Microsoft.Maui.Controls.Platform
 {
 	public class VisualElementChangedEventArgs : ElementChangedEventArgs<VisualElement>
 	{
diff --git a/src/Controls/src/Xaml.Design/AttributeTableBuilder.cs b/src/Controls/src/Xaml.Design/AttributeTableBuilder.cs
index ee769166c46c..b1a0c93011d2 100644
--- a/src/Controls/src/Xaml.Design/AttributeTableBuilder.cs
+++ b/src/Controls/src/Xaml.Design/AttributeTableBuilder.cs
@@ -1,6 +1,8 @@
 using System;
 using System.ComponentModel;
+using System.Windows.Markup;
 using Microsoft.Windows.Design;
+using Microsoft.Windows.Design.Metadata;
 
 namespace Microsoft.Maui.Controls.Xaml.Design
 {
@@ -17,6 +19,45 @@ public AttributeTableBuilder()
 			AddCallback(typeof(OnIdiomExtension), builder => builder.AddCustomAttributes(new Attribute[] {
 				new System.Windows.Markup.MarkupExtensionReturnTypeAttribute (),
 			}));
+
+			Type typeFromHandle = typeof(AppThemeBindingExtension);
+			AddTypeAttributes(typeFromHandle, new MarkupExtensionReturnTypeAttribute());
+			typeFromHandle = typeof(ArrayExtension);
+			AddTypeAttributes(typeFromHandle, new MarkupExtensionReturnTypeAttribute());
+			typeFromHandle = typeof(BindingExtension);
+			AddTypeAttributes(typeFromHandle, new MarkupExtensionReturnTypeAttribute());
+			typeFromHandle = typeof(DataTemplateExtension);
+			AddTypeAttributes(typeFromHandle, new MarkupExtensionReturnTypeAttribute());
+			typeFromHandle = typeof(DynamicResourceExtension);
+			AddTypeAttributes(typeFromHandle, new MarkupExtensionReturnTypeAttribute());
+			typeFromHandle = typeof(FontImageExtension);
+			AddTypeAttributes(typeFromHandle, new MarkupExtensionReturnTypeAttribute());
+			typeFromHandle = typeof(NullExtension);
+			AddTypeAttributes(typeFromHandle, new MarkupExtensionReturnTypeAttribute());
+			typeFromHandle = typeof(OnIdiomExtension);
+			AddTypeAttributes(typeFromHandle, new MarkupExtensionReturnTypeAttribute());
+			typeFromHandle = typeof(OnPlatformExtension);
+			AddTypeAttributes(typeFromHandle, new MarkupExtensionReturnTypeAttribute());
+			typeFromHandle = typeof(ReferenceExtension);
+			AddTypeAttributes(typeFromHandle, new MarkupExtensionReturnTypeAttribute());
+			typeFromHandle = typeof(RelativeSourceExtension);
+			AddTypeAttributes(typeFromHandle, new MarkupExtensionReturnTypeAttribute());
+			typeFromHandle = typeof(StaticExtension);
+			AddTypeAttributes(typeFromHandle, new MarkupExtensionReturnTypeAttribute());
+			typeFromHandle = typeof(StaticResourceExtension);
+			AddTypeAttributes(typeFromHandle, new MarkupExtensionReturnTypeAttribute());
+			typeFromHandle = typeof(TemplateBindingExtension);
+			AddTypeAttributes(typeFromHandle, new MarkupExtensionReturnTypeAttribute());
+			typeFromHandle = typeof(TypeExtension);
+			AddTypeAttributes(typeFromHandle, new MarkupExtensionReturnTypeAttribute());
+		}
+
+		private void AddTypeAttributes(Type type, params Attribute[] attribs)
+		{
+			AddCallback(type, delegate (AttributeCallbackBuilder builder)
+			{
+				builder.AddCustomAttributes(attribs);
+			});
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/src/Xaml.Design/Controls.Xaml.Design-net6.csproj b/src/Controls/src/Xaml.Design/Controls.Xaml.Design-net6.csproj
index 30e1e8adecf5..c12a24d8e22c 100644
--- a/src/Controls/src/Xaml.Design/Controls.Xaml.Design-net6.csproj
+++ b/src/Controls/src/Xaml.Design/Controls.Xaml.Design-net6.csproj
@@ -1,29 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
+		<TargetFrameworks>net472</TargetFrameworks>
 		<AssemblyName>Microsoft.Maui.Controls.Xaml.Design</AssemblyName>
 		<EnableDefaultCompileItems>False</EnableDefaultCompileItems>
+		<Packable>False</Packable>
+		<_MauiDesignDllBuild Condition=" '$(OS)' != 'Unix' And '$(MSBuildRuntimeType)' == 'Full'">True</_MauiDesignDllBuild>
 	</PropertyGroup>
-	<PropertyGroup>
-		<PackageId>Microsoft.Maui.Controls.Xaml.Design</PackageId>
-		<Description>Provides the design-time metadata for the XAML language service.</Description>
-	</PropertyGroup>
-	<ItemGroup Condition=" '$(OS)' != 'Unix' ">
-		<Reference Include="Microsoft.Windows.Design.Extensibility, Version=4.3.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-			<SpecificVersion>True</SpecificVersion>
+	<ItemGroup Condition=" '$(_MauiDesignDllBuild)' == 'True' ">
+		<Reference Include="Microsoft.Windows.Design.Extensibility, Version=4.3.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+				<SpecificVersion>True</SpecificVersion>
+				<HintPath>$(MSBuildToolsPath)\..\..\..\Common7\IDE\PublicAssemblies\Microsoft.Windows.Design.Extensibility.dll</HintPath>
 		</Reference>
-	</ItemGroup>
-	<ItemGroup>
-		<PackageReference Include="Xamarin.Forms.Design" Version="1.0.26-pre" Condition=" '$(OS)' != 'Unix' " />
-	</ItemGroup>
-	<ItemGroup Condition=" '$(OS)' != 'Unix' ">
+		<Reference Include="System.Xaml" />
 		<Compile Include="AttributeTableBuilder.cs" />
 		<Compile Include="Properties\AssemblyInfo.cs" />
 		<Compile Include="RegisterMetadata.cs" />
-	</ItemGroup>
-	<ItemGroup>
-		<ProjectReference Include="..\Core\Controls.Core.csproj" />
-		<ProjectReference Include="..\Xaml\Controls.Xaml.csproj">
+		<ProjectReference Include="..\Core\Controls.Core-net6.csproj" />
+		<ProjectReference Include="..\Xaml\Controls.Xaml-net6.csproj">
 			<GenerateDesignMetadata>true</GenerateDesignMetadata>
 			<Private>False</Private>
 		</ProjectReference>
diff --git a/src/Controls/src/Xaml/ApplyPropertiesVisitor.cs b/src/Controls/src/Xaml/ApplyPropertiesVisitor.cs
index 07bb6708388a..d0897edff914 100644
--- a/src/Controls/src/Xaml/ApplyPropertiesVisitor.cs
+++ b/src/Controls/src/Xaml/ApplyPropertiesVisitor.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Reflection;
 using System.Xml;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Maui.Controls.Internals;
 using Microsoft.Maui.Controls.Xaml.Diagnostics;
 using Microsoft.Maui.Controls.Xaml.Internals;
diff --git a/src/Controls/src/Xaml/Controls.Xaml-net6.csproj b/src/Controls/src/Xaml/Controls.Xaml-net6.csproj
index a474a48b11fc..891ca06be490 100644
--- a/src/Controls/src/Xaml/Controls.Xaml-net6.csproj
+++ b/src/Controls/src/Xaml/Controls.Xaml-net6.csproj
@@ -3,27 +3,41 @@
 		<TargetFrameworks>netstandard2.0;$(MauiPlatforms)</TargetFrameworks>
 		<AssemblyName>Microsoft.Maui.Controls.Xaml</AssemblyName>
 		<RootNamespace>Microsoft.Maui.Controls.Xaml</RootNamespace>
-		<NoWarn>$(NoWarn);CA2200;</NoWarn>
+		<NoWarn>$(NoWarn);CA2200;NU5128</NoWarn>
 	</PropertyGroup>
   <PropertyGroup Condition="$(TargetFramework.Contains('-windows')) == true ">
     <NoWarn>$(NoWarn);CA1416</NoWarn>
-    <DefineConstants>$(DefineConstants);WINDOWS_UWP;WINDOWS</DefineConstants>
+    <DefineConstants>$(DefineConstants);WINDOWS</DefineConstants>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
   </PropertyGroup>
-	<PropertyGroup>
-		<PackageId>Microsoft.Maui.Controls.Xaml</PackageId>
-	</PropertyGroup>
-	<ItemGroup>
-		<ProjectReference Include="..\Core\Controls.Core-net6.csproj">
-		</ProjectReference>
-	</ItemGroup>
-	<ItemGroup>
-		<Folder Include="Diagnostics\" />
-	</ItemGroup>
+  <PropertyGroup>
+    <PackageId>Microsoft.Maui.Controls.Xaml</PackageId>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Configuration" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Core\Controls.Core-net6.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Diagnostics\" />
+  </ItemGroup>
   <Target Name="Net6WinUIWorkaround" BeforeTargets="_GetSdkToolsPathsFromSdk" Condition="$(TargetFramework.Contains('-windows')) == true ">
     <PropertyGroup>
       <TargetPlatformIdentifierAdjusted>UAP</TargetPlatformIdentifierAdjusted>
     </PropertyGroup>
   </Target>
+
+   <PropertyGroup>
+    <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);_MauiPackXamlDesignAssemblies</TargetsForTfmSpecificBuildOutput>
+  </PropertyGroup>
+
+  <Target Name="_MauiPackXamlDesignAssemblies">
+    <ItemGroup>
+      <BuildOutputInPackage Include="..\Xaml.Design\bin\$(Configuration)\net472\Microsoft.Maui.Controls.Xaml.Design.dll">
+        <TargetPath>Design</TargetPath>
+      </BuildOutputInPackage>
+    </ItemGroup>
+  </Target>
 </Project>
diff --git a/src/Controls/src/Xaml/MarkupExtensions/AppThemeBindingExtension.cs b/src/Controls/src/Xaml/MarkupExtensions/AppThemeBindingExtension.cs
index c5253b980fe8..3a37e23a734f 100644
--- a/src/Controls/src/Xaml/MarkupExtensions/AppThemeBindingExtension.cs
+++ b/src/Controls/src/Xaml/MarkupExtensions/AppThemeBindingExtension.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Globalization;
 using System.Reflection;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.Maui.Controls.Xaml
 {
diff --git a/src/Controls/src/Xaml/MarkupExtensions/OnIdiomExtension.cs b/src/Controls/src/Xaml/MarkupExtensions/OnIdiomExtension.cs
index a463d0e9b457..5682e795c5f8 100644
--- a/src/Controls/src/Xaml/MarkupExtensions/OnIdiomExtension.cs
+++ b/src/Controls/src/Xaml/MarkupExtensions/OnIdiomExtension.cs
@@ -2,6 +2,7 @@
 using System.Globalization;
 using System.Reflection;
 using System.Xml;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.Maui.Controls.Xaml
 {
diff --git a/src/Controls/src/Xaml/MarkupExtensions/OnPlatformExtension.cs b/src/Controls/src/Xaml/MarkupExtensions/OnPlatformExtension.cs
index 048cf0288904..fdc13b073c88 100644
--- a/src/Controls/src/Xaml/MarkupExtensions/OnPlatformExtension.cs
+++ b/src/Controls/src/Xaml/MarkupExtensions/OnPlatformExtension.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Globalization;
 using System.Reflection;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.Maui.Controls.Xaml
 {
diff --git a/src/Controls/src/Xaml/MarkupExtensions/ReferenceExtension.cs b/src/Controls/src/Xaml/MarkupExtensions/ReferenceExtension.cs
index 92e47adefad0..41d489cf04b5 100644
--- a/src/Controls/src/Xaml/MarkupExtensions/ReferenceExtension.cs
+++ b/src/Controls/src/Xaml/MarkupExtensions/ReferenceExtension.cs
@@ -1,4 +1,5 @@
 using System;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Maui.Controls.Internals;
 using Microsoft.Maui.Controls.Xaml.Internals;
 
diff --git a/src/Controls/src/Xaml/Properties/AssemblyInfo.cs b/src/Controls/src/Xaml/Properties/AssemblyInfo.cs
index 5a7ba451e931..549ecb4a66b9 100644
--- a/src/Controls/src/Xaml/Properties/AssemblyInfo.cs
+++ b/src/Controls/src/Xaml/Properties/AssemblyInfo.cs
@@ -13,6 +13,12 @@
 
 [assembly: XmlnsDefinition("http://schemas.microsoft.com/dotnet/2021/maui", "Microsoft.Maui.Controls.Xaml")]
 [assembly: XmlnsDefinition("http://schemas.microsoft.com/dotnet/2021/maui/design", "Microsoft.Maui.Controls.Xaml")]
+[assembly: XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml", "Microsoft.Maui.Controls.Xaml")]
+[assembly: XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml", "System", AssemblyName = "mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
+[assembly: XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml", "System", AssemblyName = "System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
+[assembly: XmlnsDefinition("http://schemas.microsoft.com/winfx/2009/xaml", "Microsoft.Maui.Controls.Xaml")]
+[assembly: XmlnsDefinition("http://schemas.microsoft.com/winfx/2009/xaml", "System", AssemblyName = "mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
+[assembly: XmlnsDefinition("http://schemas.microsoft.com/winfx/2009/xaml", "System", AssemblyName = "System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
 
 #pragma warning disable CS0612 // Type or member is obsolete
 [assembly: TypeForwardedTo(typeof(Microsoft.Maui.Controls.Xaml.Internals.INameScopeProvider))]
diff --git a/src/Controls/tests/Core.UnitTests/ButtonUnitTest.cs b/src/Controls/tests/Core.UnitTests/ButtonUnitTest.cs
index 0a0186b97197..35bc68ac12a3 100644
--- a/src/Controls/tests/Core.UnitTests/ButtonUnitTest.cs
+++ b/src/Controls/tests/Core.UnitTests/ButtonUnitTest.cs
@@ -162,7 +162,7 @@ public void AssignToFontStructUpdatesFontFamily(
 					firedAttributesChanged = true;
 			};
 
-			button.Font = Font.OfSize("Testing123", size).WithAttributes(attributes);
+			button.Font = Font.OfSize("Testing123", Device.GetNamedSize(size, typeof(Label), true)).WithAttributes(attributes);
 
 			Assert.AreEqual(Device.GetNamedSize(size, typeof(Label), true), button.FontSize);
 			Assert.AreEqual(attributes, button.FontAttributes);
@@ -194,7 +194,7 @@ public void AssignToFontAttributesUpdatesFont()
 			var button = new Button();
 
 			button.FontAttributes = FontAttributes.Italic | FontAttributes.Bold;
-			Assert.AreEqual(button.Font, Font.SystemFontOfSize(button.FontSize, FontAttributes.Bold | FontAttributes.Italic));
+			Assert.AreEqual(button.Font, Font.SystemFontOfSize(button.FontSize, FontWeight.Bold, FontSlant.Italic));
 		}
 
 		[Test]
diff --git a/src/Controls/tests/Core.UnitTests/DragGestureRecognizerTests.cs b/src/Controls/tests/Core.UnitTests/DragGestureRecognizerTests.cs
index 9296595b41e8..0c5c79174076 100644
--- a/src/Controls/tests/Core.UnitTests/DragGestureRecognizerTests.cs
+++ b/src/Controls/tests/Core.UnitTests/DragGestureRecognizerTests.cs
@@ -134,7 +134,7 @@ public void TextPackageCorrectlyExtractedFromCompatibleElement(Type fieldType, s
 			var dragRec = new DragGestureRecognizer();
 			var element = (VisualElement)Activator.CreateInstance(fieldType);
 			Assert.IsTrue(element.TrySetValue(result));
-			var args = dragRec.SendDragStarting(element);
+			var args = dragRec.SendDragStarting((IView)element);
 			Assert.AreEqual(result, args.Data.Text);
 		}
 
diff --git a/src/Controls/tests/Core.UnitTests/FontUnitTests.cs b/src/Controls/tests/Core.UnitTests/FontUnitTests.cs
index 0104d6bb8b3c..3edad769d032 100644
--- a/src/Controls/tests/Core.UnitTests/FontUnitTests.cs
+++ b/src/Controls/tests/Core.UnitTests/FontUnitTests.cs
@@ -14,7 +14,6 @@ public void TestFontForSize()
 			var font = Font.OfSize("Foo", 12);
 			Assert.AreEqual("Foo", font.FontFamily);
 			Assert.AreEqual(12, font.FontSize);
-			Assert.AreEqual((NamedSize)0, font.NamedSize);
 		}
 
 		[Test]
@@ -23,16 +22,15 @@ public void TestFontForSizeDouble()
 			var font = Font.OfSize("Foo", 12.7);
 			Assert.AreEqual("Foo", font.FontFamily);
 			Assert.AreEqual(12.7, font.FontSize);
-			Assert.AreEqual((NamedSize)0, font.NamedSize);
 		}
 
 		[Test]
 		public void TestFontForNamedSize()
 		{
-			var font = Font.OfSize("Foo", NamedSize.Large);
+			var size = Device.GetNamedSize(NamedSize.Large, null, false);
+			var font = Font.OfSize("Foo", size);
 			Assert.AreEqual("Foo", font.FontFamily);
-			Assert.AreEqual(0, font.FontSize);
-			Assert.AreEqual(NamedSize.Large, font.NamedSize);
+			Assert.AreEqual(size, font.FontSize);
 		}
 
 		[Test]
@@ -41,12 +39,12 @@ public void TestSystemFontOfSize()
 			var font = Font.SystemFontOfSize(12);
 			Assert.AreEqual(null, font.FontFamily);
 			Assert.AreEqual(12, font.FontSize);
-			Assert.AreEqual((NamedSize)0, font.NamedSize);
 
-			font = Font.SystemFontOfSize(NamedSize.Medium);
+
+			var size = Device.GetNamedSize(NamedSize.Medium, null, false);
+			font = Font.SystemFontOfSize(size);
 			Assert.AreEqual(null, font.FontFamily);
-			Assert.AreEqual(0, font.FontSize);
-			Assert.AreEqual(NamedSize.Medium, font.NamedSize);
+			Assert.AreEqual(size, font.FontSize);
 		}
 
 		[TestCase("en-US"), TestCase("tr-TR"), TestCase("fr-FR")]
@@ -57,12 +55,11 @@ public void CultureTestSystemFontOfSizeDouble(string culture)
 			var font = Font.SystemFontOfSize(12.7);
 			Assert.AreEqual(null, font.FontFamily);
 			Assert.AreEqual(12.7, font.FontSize);
-			Assert.AreEqual((NamedSize)0, font.NamedSize);
 
-			font = Font.SystemFontOfSize(NamedSize.Medium);
+			var size = Device.GetNamedSize(NamedSize.Medium, null, false);
+			font = Font.SystemFontOfSize(size);
 			Assert.AreEqual(null, font.FontFamily);
-			Assert.AreEqual(0, font.FontSize);
-			Assert.AreEqual(NamedSize.Medium, font.NamedSize);
+			Assert.AreEqual(size, font.FontSize);
 		}
 
 		[Test]
@@ -108,18 +105,21 @@ public void TestEquals()
 		public void TestFontConverter()
 		{
 			var converter = new FontTypeConverter();
+			var microSize = Device.GetNamedSize(NamedSize.Micro, null, false);
+			var mediumSize = Device.GetNamedSize(NamedSize.Medium, null, false);
+			var largeSize = Device.GetNamedSize(NamedSize.Large, null, false);
 			Assert.True(converter.CanConvertFrom(typeof(string)));
-			Assert.AreEqual(Font.SystemFontOfSize(NamedSize.Medium), converter.ConvertFromInvariantString("Medium"));
+			Assert.AreEqual(Font.SystemFontOfSize(mediumSize), converter.ConvertFromInvariantString("Medium"));
 			Assert.AreEqual(Font.SystemFontOfSize(42), converter.ConvertFromInvariantString("42"));
-			Assert.AreEqual(Font.OfSize("Foo", NamedSize.Micro), converter.ConvertFromInvariantString("Foo, Micro"));
+			Assert.AreEqual(Font.OfSize("Foo", microSize), converter.ConvertFromInvariantString("Foo, Micro"));
 			Assert.AreEqual(Font.OfSize("Foo", 42), converter.ConvertFromInvariantString("Foo, 42"));
 			Assert.AreEqual(Font.OfSize("Foo", 12.7), converter.ConvertFromInvariantString("Foo, 12.7"));
-			Assert.AreEqual(Font.SystemFontOfSize(NamedSize.Large, FontAttributes.Bold), converter.ConvertFromInvariantString("Bold, Large"));
-			Assert.AreEqual(Font.SystemFontOfSize(42, FontAttributes.Bold), converter.ConvertFromInvariantString("Bold, 42"));
-			Assert.AreEqual(Font.OfSize("Foo", NamedSize.Medium), converter.ConvertFromInvariantString("Foo"));
-			Assert.AreEqual(Font.OfSize("Foo", NamedSize.Large).WithAttributes(FontAttributes.Bold), converter.ConvertFromInvariantString("Foo, Bold, Large"));
-			Assert.AreEqual(Font.OfSize("Foo", NamedSize.Large).WithAttributes(FontAttributes.Italic), converter.ConvertFromInvariantString("Foo, Italic, Large"));
-			Assert.AreEqual(Font.OfSize("Foo", NamedSize.Large).WithAttributes(FontAttributes.Bold | FontAttributes.Italic), converter.ConvertFromInvariantString("Foo, Bold, Italic, Large"));
+			Assert.AreEqual(Font.SystemFontOfSize(largeSize, FontWeight.Bold), converter.ConvertFromInvariantString("Bold, Large"));
+			Assert.AreEqual(Font.SystemFontOfSize(42, FontWeight.Bold), converter.ConvertFromInvariantString("Bold, 42"));
+			Assert.AreEqual(Font.OfSize("Foo", mediumSize), converter.ConvertFromInvariantString("Foo"));
+			Assert.AreEqual(Font.OfSize("Foo", largeSize).WithAttributes(FontAttributes.Bold), converter.ConvertFromInvariantString("Foo, Bold, Large"));
+			Assert.AreEqual(Font.OfSize("Foo", largeSize).WithAttributes(FontAttributes.Italic), converter.ConvertFromInvariantString("Foo, Italic, Large"));
+			Assert.AreEqual(Font.OfSize("Foo", largeSize).WithAttributes(FontAttributes.Bold | FontAttributes.Italic), converter.ConvertFromInvariantString("Foo, Bold, Italic, Large"));
 			Assert.AreEqual(Font.OfSize("Foo", 12).WithAttributes(FontAttributes.Bold), converter.ConvertFromInvariantString("Foo, Bold, 12"));
 			Assert.AreEqual(Font.OfSize("Foo", 12.7).WithAttributes(FontAttributes.Bold), converter.ConvertFromInvariantString("Foo, Bold, 12.7"));
 			Assert.AreEqual(Font.OfSize("Foo", 12).WithAttributes(FontAttributes.Italic), converter.ConvertFromInvariantString("Foo, Italic, 12"));
diff --git a/src/Controls/tests/Core.UnitTests/ImageButtonUnitTest.cs b/src/Controls/tests/Core.UnitTests/ImageButtonUnitTest.cs
index b09975b67154..6b2198910878 100644
--- a/src/Controls/tests/Core.UnitTests/ImageButtonUnitTest.cs
+++ b/src/Controls/tests/Core.UnitTests/ImageButtonUnitTest.cs
@@ -259,7 +259,7 @@ public async void Load()
 				{
 					initialLoad = false;
 					Element.SetIsLoading(true);
-					await (Element.Source as UriImageSource).GetStreamAsync();
+					await ((IStreamImageSource)Element.Source).GetStreamAsync();
 					Element.SetIsLoading(false);
 				}
 			}
diff --git a/src/Controls/tests/Core.UnitTests/ImageTests.cs b/src/Controls/tests/Core.UnitTests/ImageTests.cs
index 9841fae2e7b0..b6403377b24e 100644
--- a/src/Controls/tests/Core.UnitTests/ImageTests.cs
+++ b/src/Controls/tests/Core.UnitTests/ImageTests.cs
@@ -257,9 +257,10 @@ public async void Load()
 				if (initialLoad && Element.Source != null)
 				{
 					initialLoad = false;
-					Element.SetIsLoading(true);
-					await (Element.Source as UriImageSource).GetStreamAsync();
-					Element.SetIsLoading(false);
+					var controller = (IImageController)Element;
+					controller.SetIsLoading(true);
+					await ((IStreamImageSource)Element.Source).GetStreamAsync();
+					controller.SetIsLoading(false);
 				}
 			}
 
diff --git a/src/Controls/tests/Core.UnitTests/Layouts/GridLayoutTests.cs b/src/Controls/tests/Core.UnitTests/Layouts/GridLayoutTests.cs
new file mode 100644
index 000000000000..a666aa60bd43
--- /dev/null
+++ b/src/Controls/tests/Core.UnitTests/Layouts/GridLayoutTests.cs
@@ -0,0 +1,44 @@
+using System.Collections.Generic;
+using Microsoft.Maui.Controls.Layout2;
+using NUnit.Framework;
+
+namespace Microsoft.Maui.Controls.Core.UnitTests.Layouts
+{
+	public class GridLayoutTests
+	{
+		[Test]
+		public void RemovedViewsHaveNoRowColumnInfo()
+		{
+			var gl = new GridLayout();
+			var view = new Label();
+
+			gl.Add(view);
+			gl.SetRow(view, 2);
+
+			// Check our assumptions
+			Assert.AreEqual(2, gl.GetRow(view));
+
+			// Okay, removing the View from the Grid should mean that any attempt to get row/column info
+			// for that View should fail
+			gl.Remove(view);
+
+			Assert.Throws(typeof(KeyNotFoundException), () => gl.GetRow(view));
+			Assert.Throws(typeof(KeyNotFoundException), () => gl.GetRowSpan(view));
+			Assert.Throws(typeof(KeyNotFoundException), () => gl.GetColumn(view));
+			Assert.Throws(typeof(KeyNotFoundException), () => gl.GetColumnSpan(view));
+		}
+
+		[Test]
+		public void AddedViewGetsDefaultRowAndColumn()
+		{
+			var gl = new GridLayout();
+			var view = new Label();
+
+			gl.Add(view);
+			Assert.AreEqual(0, gl.GetRow(view));
+			Assert.AreEqual(0, gl.GetColumn(view));
+			Assert.AreEqual(1, gl.GetRowSpan(view));
+			Assert.AreEqual(1, gl.GetColumnSpan(view));
+		}
+	}
+}
diff --git a/src/Controls/tests/Core.UnitTests/NavigationPageLifecycleTests.cs b/src/Controls/tests/Core.UnitTests/NavigationPageLifecycleTests.cs
new file mode 100644
index 000000000000..470a267433af
--- /dev/null
+++ b/src/Controls/tests/Core.UnitTests/NavigationPageLifecycleTests.cs
@@ -0,0 +1,134 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using NUnit.Framework;
+
+namespace Microsoft.Maui.Controls.Core.UnitTests
+{
+	[TestFixture]
+	public class NavigationPageLifecycleTests : BaseTestFixture
+	{
+		[Test]
+		public async Task AppearingFiresForInitialPage()
+		{
+			ContentPage contentPage = new ContentPage();
+			ContentPage resultPage = null;
+
+			contentPage.Appearing += (sender, _)
+				=> resultPage = (ContentPage)sender;
+
+			NavigationPage nav = new NavigationPage(contentPage);
+			Assert.IsNull(resultPage);
+			nav.SendAppearing();
+			Assert.AreEqual(resultPage, contentPage);
+		}
+
+		[Test]
+		public async Task PushLifeCycle()
+		{
+			ContentPage initialPage = new ContentPage();
+			ContentPage pushedPage = new ContentPage();
+
+			ContentPage initialPageDisappear = null;
+			ContentPage pageAppearing = null;
+
+			initialPage.Disappearing += (sender, _)
+				=> initialPageDisappear = (ContentPage)sender;
+
+			pushedPage.Appearing += (sender, _)
+				=> pageAppearing = (ContentPage)sender;
+
+			NavigationPage nav = new NavigationPage(initialPage);
+			nav.SendAppearing();
+
+			await nav.PushAsync(pushedPage);
+
+			Assert.AreEqual(initialPageDisappear, initialPage);
+			Assert.AreEqual(pageAppearing, pushedPage);
+		}
+
+		[Test]
+		public async Task PopLifeCycle()
+		{
+			ContentPage initialPage = new ContentPage();
+			ContentPage pushedPage = new ContentPage();
+
+			ContentPage initialPageAppearing = null;
+			ContentPage pageDisappeared = null;
+
+			NavigationPage nav = new NavigationPage(initialPage);
+			nav.SendAppearing();
+
+			initialPage.Appearing += (sender, _)
+				=> initialPageAppearing = (ContentPage)sender;
+
+			pushedPage.Disappearing += (sender, _)
+				=> pageDisappeared = (ContentPage)sender;
+
+			await nav.PushAsync(pushedPage);
+			Assert.IsNull(initialPageAppearing);
+			Assert.IsNull(pageDisappeared);
+
+			await nav.PopAsync();
+
+			Assert.AreEqual(initialPageAppearing, initialPage);
+			Assert.AreEqual(pageDisappeared, pushedPage);
+		}
+
+		[Test]
+		public async Task RemoveLastPage()
+		{
+			ContentPage initialPage = new ContentPage();
+			ContentPage pushedPage = new ContentPage();
+
+			ContentPage initialPageAppearing = null;
+			ContentPage pageDisappeared = null;
+
+			NavigationPage nav = new NavigationPage(initialPage);
+			nav.SendAppearing();
+
+			initialPage.Appearing += (sender, _)
+				=> initialPageAppearing = (ContentPage)sender;
+
+			pushedPage.Disappearing += (sender, _)
+				=> pageDisappeared = (ContentPage)sender;
+
+			await nav.PushAsync(pushedPage);
+			Assert.IsNull(initialPageAppearing);
+			Assert.IsNull(pageDisappeared);
+
+			nav.Navigation.RemovePage(pushedPage);
+
+			Assert.AreEqual(initialPageAppearing, initialPage);
+			Assert.AreEqual(pageDisappeared, pushedPage);
+		}
+
+
+		[Test]
+		public async Task RemoveInnerPage()
+		{
+			ContentPage initialPage = new ContentPage();
+			ContentPage pushedPage = new ContentPage();
+
+			ContentPage initialPageAppearing = null;
+			ContentPage pageDisappeared = null;
+
+			NavigationPage nav = new NavigationPage(initialPage);
+			nav.SendAppearing();
+
+			var pageToRemove = new ContentPage();
+			await nav.PushAsync(pageToRemove);
+			await nav.PushAsync(pushedPage);
+
+
+			initialPage.Appearing += (__, _)
+				=> Assert.Fail("Appearing Fired Incorrectly");
+
+			pushedPage.Disappearing += (__, _)
+				=> Assert.Fail("Appearing Fired Incorrectly");
+
+			nav.Navigation.RemovePage(pageToRemove);
+		}
+	}
+}
diff --git a/src/Controls/tests/Core.UnitTests/PageTests.cs b/src/Controls/tests/Core.UnitTests/PageTests.cs
index 6d1bb53e65f6..7dc21940300a 100644
--- a/src/Controls/tests/Core.UnitTests/PageTests.cs
+++ b/src/Controls/tests/Core.UnitTests/PageTests.cs
@@ -427,6 +427,7 @@ public void SendApplicationPageAppearing()
 			app.MainPage = page;
 			app.PageAppearing += (sender, args) => actual = args;
 
+			((IPageController)page).SendDisappearing();
 			((IPageController)page).SendAppearing();
 
 			Assert.AreSame(page, actual);
diff --git a/src/Controls/tests/Core.UnitTests/UriImageSourceTests.cs b/src/Controls/tests/Core.UnitTests/UriImageSourceTests.cs
index 8691ad25c6e3..2d15b6b0b54f 100644
--- a/src/Controls/tests/Core.UnitTests/UriImageSourceTests.cs
+++ b/src/Controls/tests/Core.UnitTests/UriImageSourceTests.cs
@@ -52,7 +52,7 @@ static async Task<Stream> GetStreamAsync(Uri uri, CancellationToken cancellation
 		[Ignore("LoadImageFromStream")]
 		public void LoadImageFromStream()
 		{
-			var loader = new UriImageSource
+			IStreamImageSource loader = new UriImageSource
 			{
 				Uri = new Uri("http://foo.com/Images/crimson.jpg"),
 			};
@@ -65,7 +65,7 @@ public void LoadImageFromStream()
 		[Ignore("SecondCallLoadFromCache")]
 		public void SecondCallLoadFromCache()
 		{
-			var loader = new UriImageSource
+			IStreamImageSource loader = new UriImageSource
 			{
 				Uri = new Uri("http://foo.com/Images/crimson.jpg"),
 			};
@@ -88,7 +88,7 @@ public void SecondCallLoadFromCache()
 		[Ignore("DoNotKeepFailedRetrieveInCache")]
 		public void DoNotKeepFailedRetrieveInCache()
 		{
-			var loader = new UriImageSource
+			IStreamImageSource loader = new UriImageSource
 			{
 				Uri = new Uri("http://foo.com/missing.png"),
 			};
@@ -107,7 +107,7 @@ public void DoNotKeepFailedRetrieveInCache()
 		[Ignore("ConcurrentCallsOnSameUriAreQueued")]
 		public void ConcurrentCallsOnSameUriAreQueued()
 		{
-			var loader = new UriImageSource
+			IStreamImageSource loader = new UriImageSource
 			{
 				Uri = new Uri("http://foo.com/Images/crimson.jpg"),
 			};
diff --git a/src/Controls/tests/Core.UnitTests/WindowsTests.cs b/src/Controls/tests/Core.UnitTests/WindowsTests.cs
new file mode 100644
index 000000000000..f2c83d8aaceb
--- /dev/null
+++ b/src/Controls/tests/Core.UnitTests/WindowsTests.cs
@@ -0,0 +1,88 @@
+using NUnit.Framework;
+
+namespace Microsoft.Maui.Controls.Core.UnitTests
+{
+	[TestFixture]
+	public class WindowsTests : BaseTestFixture
+	{
+		[SetUp]
+		public override void Setup()
+		{
+			base.Setup();
+			Device.PlatformServices = new MockPlatformServices();
+		}
+
+		[TearDown]
+		public override void TearDown()
+		{
+			base.TearDown();
+			Device.PlatformServices = null;
+		}
+
+		[Test]
+		public void AddWindow()
+		{
+			var app = new TestApp();
+			var window = app.CreateWindow();
+			ValidateSetup(app);
+		}
+
+		[Test]
+		public void SetMainPage()
+		{
+			var app = new TestApp();
+			app.MainPage = new ContentPage();
+			ValidateSetup(app);
+		}
+
+		[Test]
+		public void SetMainPageTwice()
+		{
+			var app = new TestApp();
+			var firstPage = new ContentPage();
+			var secondPage = new ContentPage();
+
+			app.MainPage = firstPage;
+			app.MainPage = secondPage;
+
+			ValidateSetup(app, secondPage);
+			Assert.IsNull(firstPage.Parent);
+		}
+
+
+		void ValidateSetup(TestApp app, Page page = null)
+		{
+			var window = (Window)app.Windows[0];
+			page ??= window.Page;
+
+			// Validate all the parent hierarchies are correct
+			Assert.AreEqual(app, window.Parent);
+			Assert.AreEqual(window, window.Page.Parent);
+			Assert.AreEqual(app.Windows.Count, 1);
+			Assert.AreEqual(app.LogicalChildren[0], window);
+			Assert.AreEqual(window.LogicalChildren[0], page);
+			Assert.AreEqual(app.LogicalChildren.Count, 1);
+			Assert.AreEqual(window.LogicalChildren.Count, 1);
+			Assert.AreEqual(app.NavigationProxy, window.NavigationProxy.Inner);
+			Assert.AreEqual(window.NavigationProxy, page.NavigationProxy.Inner);
+		}
+
+		public class TestApp : Application
+		{
+			public TestWindow CreateWindow() =>
+				(TestWindow)(this as IApplication).CreateWindow(null);
+
+			protected override IWindow CreateWindow(IActivationState activationState)
+			{
+				return new TestWindow(new ContentPage());
+			}
+		}
+
+		public class TestWindow : Window
+		{
+			public TestWindow(Page page) : base(page)
+			{
+			}
+		}
+	}
+}
diff --git a/src/Controls/tests/Xaml.UnitTests/FontConverterTests.cs b/src/Controls/tests/Xaml.UnitTests/FontConverterTests.cs
index f975c2f6ee17..a4db54e0bb59 100644
--- a/src/Controls/tests/Xaml.UnitTests/FontConverterTests.cs
+++ b/src/Controls/tests/Xaml.UnitTests/FontConverterTests.cs
@@ -6,9 +6,9 @@ namespace Microsoft.Maui.Controls.Xaml.UnitTests
 	[TestFixture]
 	public class FontConverterTests : BaseTestFixture
 	{
-		[TestCase("Bold", Maui.FontAttributes.Bold)]
-		[TestCase("Italic", Maui.FontAttributes.Italic)]
-		[TestCase("Bold, Italic", Maui.FontAttributes.Bold | Maui.FontAttributes.Italic)]
+		[TestCase("Bold", Controls.FontAttributes.Bold)]
+		[TestCase("Italic", Controls.FontAttributes.Italic)]
+		[TestCase("Bold, Italic", Controls.FontAttributes.Bold | Controls.FontAttributes.Italic)]
 		public void FontAttributes(string attributeString, FontAttributes result)
 		{
 			var xaml = @"
diff --git a/src/Core/src/Core-net6.csproj b/src/Core/src/Core-net6.csproj
index 7fa5242ce674..8a77e5ec9d87 100644
--- a/src/Core/src/Core-net6.csproj
+++ b/src/Core/src/Core-net6.csproj
@@ -17,12 +17,11 @@
     <PackageReference Include="Microsoft.Extensions.Configuration" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
-		<PackageReference Include="Microsoft.Maui.Graphics" />
+    <PackageReference Include="Microsoft.Maui.Graphics" />
     <PackageReference Include="Reloadify3000" Version="1.0.6" />
   </ItemGroup>
-  <ItemGroup Condition="$([MSBuild]::IsOSPlatform('windows'))">
-    <None Include="bin\$(Configuration)\$(WindowsTargetFramework)\Microsoft.Maui.pri" Visible="False" Pack="True" PackagePath="runtimes\$(WindowsTargetFramework)\native" />
-    <None Include="bin\$(Configuration)\$(WindowsTargetFramework)\Microsoft.Maui\**\*.xbf" Visible="False" Pack="True" PackagePath="lib\$(WindowsTargetFramework)\Microsoft.Maui\%(RecursiveDir)%(FileName)%(Extension);runtimes\$(WindowsTargetFramework)\native\Microsoft.Maui\%(RecursiveDir)%(FileName)%(Extension)" />
+  <ItemGroup Condition="$(TargetFramework.Contains('-android'))">
+    <PackageReference Include="Xamarin.Android.Glide" />
   </ItemGroup>
 </Project>
 
diff --git a/src/Core/src/Core.csproj b/src/Core/src/Core.csproj
index 6a8b0b942dde..5a73310f262a 100644
--- a/src/Core/src/Core.csproj
+++ b/src/Core/src/Core.csproj
@@ -1,19 +1,22 @@
-<Project Sdk="MSBuild.Sdk.Extras">
-	<PropertyGroup>
-		<TargetFrameworks>netstandard2.1;netstandard2.0;Xamarin.iOS10;MonoAndroid10.0</TargetFrameworks>
-		<RootNamespace>Microsoft.Maui</RootNamespace>
-		<AssemblyName>Microsoft.Maui</AssemblyName>
-		<Nullable>enable</Nullable>
-	</PropertyGroup>
-	<PropertyGroup>
-		<PackageId>Microsoft.Maui</PackageId>
-	</PropertyGroup>
-	<Import Project="..\..\..\.nuspec\Microsoft.Maui.Controls.MultiTargeting.targets" />
-	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.Configuration" />
-		<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
-		<PackageReference Include="Microsoft.Maui.Graphics" />
-    	<PackageReference Include="Reloadify3000" Version="1.0.6" />
-	</ItemGroup>
+<Project Sdk="MSBuild.Sdk.Extras">
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.1;netstandard2.0;$(NonNet6Platforms)</TargetFrameworks>
+    <RootNamespace>Microsoft.Maui</RootNamespace>
+    <AssemblyName>Microsoft.Maui</AssemblyName>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+  <PropertyGroup>
+    <PackageId>Microsoft.Maui</PackageId>
+  </PropertyGroup>
+  <Import Project="..\..\..\.nuspec\Microsoft.Maui.Controls.MultiTargeting.targets" />
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Configuration" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
+    <PackageReference Include="Microsoft.Maui.Graphics" />
+    <PackageReference Include="Reloadify3000" Version="1.0.6" />
+  </ItemGroup>
+  <ItemGroup Condition="$(TargetFramework.StartsWith('MonoAndroid'))">
+    <PackageReference Include="Xamarin.Android.Glide" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Core/src/Core/Extensions/IPickerExtension.cs b/src/Core/src/Core/Extensions/IPickerExtension.cs
new file mode 100644
index 000000000000..b2590252849a
--- /dev/null
+++ b/src/Core/src/Core/Extensions/IPickerExtension.cs
@@ -0,0 +1,9 @@
+using System;
+using System.Linq;
+namespace Microsoft.Maui
+{
+	public static class IPickerExtension
+	{
+		public static string[] GetItemsAsArray(this IPicker picker) => Enumerable.Range(0, picker.GetCount()).Select(i => picker.GetItem(i)).ToArray();
+	}
+}
diff --git a/src/Core/src/Core/IEditor.cs b/src/Core/src/Core/IEditor.cs
index a97f206597f6..14e6176f655f 100644
--- a/src/Core/src/Core/IEditor.cs
+++ b/src/Core/src/Core/IEditor.cs
@@ -11,5 +11,10 @@ public interface IEditor : IView, ITextInput, ITextStyle, ITextAlignment
 		/// Gets or sets the placeholder text color.
 		/// </summary>
 		Color PlaceholderColor { get; set; }
+
+		/// <summary>
+		/// Occurs when the user finalizes the text in an editor with the return key.
+		/// </summary>
+		void Completed();
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Core/IEntry.cs b/src/Core/src/Core/IEntry.cs
index 7472ec4ba3e6..80b90ca9e200 100644
--- a/src/Core/src/Core/IEntry.cs
+++ b/src/Core/src/Core/IEntry.cs
@@ -19,5 +19,10 @@ public interface IEntry : IView, ITextInput, ITextAlignment
 		/// Gets an enumeration value that shows/hides clear button on the Entry.
 		/// </summary>
 		ClearButtonVisibility ClearButtonVisibility { get; }
+
+		/// <summary>
+		/// Occurs when the user finalizes the text in an entry with the return key.
+		/// </summary>
+		void Completed();
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Core/IFrameworkElement.cs b/src/Core/src/Core/IFrameworkElement.cs
index 70ac15f45908..d76e7b6c63f2 100644
--- a/src/Core/src/Core/IFrameworkElement.cs
+++ b/src/Core/src/Core/IFrameworkElement.cs
@@ -1,8 +1,7 @@
-#nullable enable
+#nullable enable
 using Microsoft.Maui.Graphics;
 using Microsoft.Maui.Primitives;
 
-
 namespace Microsoft.Maui
 {
 	/// <summary>
@@ -16,9 +15,19 @@ public interface IFrameworkElement
 		bool IsEnabled { get; }
 
 		/// <summary>
-		/// Gets the color which will fill the background of a FrameworkElement.
+		/// Gets a value that determines whether this FrameworkElement should be part of the visual tree or not.
+		/// </summary>
+		Visibility Visibility { get; }
+
+		/// <summary>
+		/// Gets the opacity value applied to the view when it is rendered.
+		/// </summary>
+		double Opacity { get; }
+
+		/// <summary>
+		/// Gets the paint which will fill the background of a FrameworkElement.
 		/// </summary>
-		Color BackgroundColor { get; }
+		Paint? Background { get; }
 
 		/// <summary>
 		/// Gets the bounds of the FrameworkElement.
diff --git a/src/Core/src/Core/IImage.cs b/src/Core/src/Core/IImage.cs
new file mode 100644
index 000000000000..5fe942167d55
--- /dev/null
+++ b/src/Core/src/Core/IImage.cs
@@ -0,0 +1,31 @@
+#nullable enable
+
+using System;
+
+namespace Microsoft.Maui
+{
+	public interface IImage : IView, IImageSourcePart
+	{
+		Aspect Aspect { get; }
+
+		bool IsOpaque { get; }
+	}
+
+	public interface IImageSourcePart
+	{
+		IImageSource? Source { get; }
+
+		bool IsAnimationPlaying { get; }
+
+		void UpdateIsLoading(bool isLoading);
+	}
+
+	public interface IImageSourcePartEvents
+	{
+		void LoadingStarted();
+
+		void LoadingCompleted(bool successful);
+
+		void LoadingFailed(Exception exception);
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Core/IPage.cs b/src/Core/src/Core/IPage.cs
index 25be3b70d5ed..209940fa97d9 100644
--- a/src/Core/src/Core/IPage.cs
+++ b/src/Core/src/Core/IPage.cs
@@ -9,5 +9,10 @@ public interface IPage : IView
 		/// Gets the view that contains the content of the Page.
 		/// </summary>
 		public IView Content { get; }
+
+		/// <summary>
+		/// Gets the title of the Page.
+		/// </summary>
+		public string Title { get; }
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Core/IPicker.cs b/src/Core/src/Core/IPicker.cs
index 2372836021b2..1ab25fc45c52 100644
--- a/src/Core/src/Core/IPicker.cs
+++ b/src/Core/src/Core/IPicker.cs
@@ -7,31 +7,16 @@ namespace Microsoft.Maui
 	/// <summary>
 	/// Represents a View for selecting a text item from a list of data.
 	/// </summary>
-	public interface IPicker : IView, ITextStyle, ITextAlignment
+	public interface IPicker : IView, ITextStyle, ITextAlignment, IItemDelegate<string>
 	{
 		/// <summary>
 		/// Gets the title for the Picker.
 		/// </summary>
 		string Title { get; }
 
-		/// <summary>
-		/// Gets or sets the internal list of items to template and display.
-		/// </summary>
-		IList<string> Items { get; }
-
-		/// <summary>
-		/// Gets or sets the source list of items to template and display.
-		/// </summary>
-		IList ItemsSource { get; }
-
 		/// <summary>
 		/// Gets the index of the selected item of the picker.
 		/// </summary>
 		int SelectedIndex { get; set; }
-
-		/// <summary>
-		/// Gets the selected item.
-		/// </summary>
-		object? SelectedItem { get; set; }
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Core/IRadioButton.cs b/src/Core/src/Core/IRadioButton.cs
new file mode 100644
index 000000000000..61d5e3e470c1
--- /dev/null
+++ b/src/Core/src/Core/IRadioButton.cs
@@ -0,0 +1,15 @@
+using Microsoft.Maui.Graphics;
+
+namespace Microsoft.Maui
+{
+	/// <summary>
+	/// Represents a View that provides a toggled value.
+	/// </summary>
+	public interface IRadioButton : IView
+	{
+		/// <summary>
+		/// Gets or sets a Boolean value that indicates whether this RadioButton is checked.
+		/// </summary>
+		bool IsChecked { get; set; }
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Core/ISafeAreaView.cs b/src/Core/src/Core/ISafeAreaView.cs
new file mode 100644
index 000000000000..273df4078f49
--- /dev/null
+++ b/src/Core/src/Core/ISafeAreaView.cs
@@ -0,0 +1,8 @@
+using System;
+namespace Microsoft.Maui
+{
+	public interface ISafeAreaView
+	{
+		bool IgnoreSafeArea { get; }
+	}
+}
diff --git a/src/Core/src/Core/ISearchBar.cs b/src/Core/src/Core/ISearchBar.cs
index b963442a1f4c..5829b805ec5d 100644
--- a/src/Core/src/Core/ISearchBar.cs
+++ b/src/Core/src/Core/ISearchBar.cs
@@ -5,6 +5,9 @@
 	/// </summary>
 	public interface ISearchBar : IView, ITextInput, ITextAlignment
 	{
-
+		/// <summary>
+		/// Notify when the user presses the Search button.
+		/// </summary>
+		void SearchButtonPressed();
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Core/IWindow.cs b/src/Core/src/Core/IWindow.cs
index 47efe1281cd6..e24133320993 100644
--- a/src/Core/src/Core/IWindow.cs
+++ b/src/Core/src/Core/IWindow.cs
@@ -3,16 +3,11 @@ namespace Microsoft.Maui
 	/// <summary>
 	/// Provides the ability to create, configure, show, and manage Windows.
 	/// </summary>
-	public interface IWindow
+	public interface IWindow : IFrameworkElement
 	{
-		/// <summary>
-		/// Gets or sets the .NET MAUI Context.
-		/// </summary>
-		IMauiContext MauiContext { get; set; }
-
 		/// <summary>
 		/// Gets or sets the current Page displayed in the Window.
 		/// </summary>
-		IPage Page { get; set; }
+		IView View { get; set; }
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Fonts/EmbeddedFontLoader.Android.cs b/src/Core/src/Fonts/EmbeddedFontLoader.Android.cs
index 46c109d64e83..e635fc64c7a8 100644
--- a/src/Core/src/Fonts/EmbeddedFontLoader.Android.cs
+++ b/src/Core/src/Fonts/EmbeddedFontLoader.Android.cs
@@ -1,12 +1,8 @@
-using System.IO;
+#nullable enable
 
 namespace Microsoft.Maui
 {
-	public class EmbeddedFontLoader : FileSystemEmbeddedFontLoader
+	public partial class EmbeddedFontLoader : FileSystemEmbeddedFontLoader
 	{
-		public EmbeddedFontLoader()
-			: base(Path.GetTempPath())
-		{
-		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Fonts/EmbeddedFontLoader.Standard.cs b/src/Core/src/Fonts/EmbeddedFontLoader.Standard.cs
index 9104cc6cdfa8..caa09637cf99 100644
--- a/src/Core/src/Fonts/EmbeddedFontLoader.Standard.cs
+++ b/src/Core/src/Fonts/EmbeddedFontLoader.Standard.cs
@@ -1,7 +1,9 @@
+#nullable enable
+
 namespace Microsoft.Maui
 {
-	public class EmbeddedFontLoader : IEmbeddedFontLoader
+	public partial class EmbeddedFontLoader
 	{
-		public (bool success, string? filePath) LoadFont(EmbeddedFont font) => (false, null);
+		public string? LoadFont(EmbeddedFont font) => null;
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Fonts/EmbeddedFontLoader.Windows.cs b/src/Core/src/Fonts/EmbeddedFontLoader.Windows.cs
index 027613325dac..8bf30c6816e3 100644
--- a/src/Core/src/Fonts/EmbeddedFontLoader.Windows.cs
+++ b/src/Core/src/Fonts/EmbeddedFontLoader.Windows.cs
@@ -1,22 +1,22 @@
 #nullable enable
 using System;
-using System.Diagnostics;
 using System.IO;
+using Microsoft.Extensions.Logging;
 using Windows.Storage;
 
 namespace Microsoft.Maui
 {
-	public class EmbeddedFontLoader : IEmbeddedFontLoader
+	public partial class EmbeddedFontLoader
 	{
 		const string FontCacheFolderName = "fonts";
 
-		public (bool success, string? filePath) LoadFont(EmbeddedFont font)
+		public string? LoadFont(EmbeddedFont font)
 		{
 			var tmpdir = ApplicationData.Current.LocalFolder.CreateFolderAsync(FontCacheFolderName, CreationCollisionOption.OpenIfExists).AsTask().Result;
 
 			var file = tmpdir.TryGetItemAsync(font.FontName).AsTask().Result;
 			if (file != null)
-				return (true, CleanseFilePath(file.Path));
+				return CleanseFilePath(file.Path);
 
 			StorageFile? newFile = null;
 			try
@@ -30,17 +30,17 @@ public class EmbeddedFontLoader : IEmbeddedFontLoader
 					font.ResourceStream.CopyTo(fileStream);
 				}
 
-				return (true, CleanseFilePath(newFile.Path));
+				return CleanseFilePath(newFile.Path);
 			}
 			catch (Exception ex)
 			{
-				Debug.WriteLine(ex);
+				_logger?.LogWarning(ex, "Unable copy font {Font} to local file system.", font.FontName);
 
 				if (newFile != null)
 					newFile.DeleteAsync().AsTask().Wait();
 			}
 
-			return (false, null);
+			return null;
 		}
 
 		static string CleanseFilePath(string filePath)
diff --git a/src/Core/src/Fonts/EmbeddedFontLoader.cs b/src/Core/src/Fonts/EmbeddedFontLoader.cs
new file mode 100644
index 000000000000..76e0ece5328e
--- /dev/null
+++ b/src/Core/src/Fonts/EmbeddedFontLoader.cs
@@ -0,0 +1,33 @@
+#nullable enable
+using System.IO;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.Maui
+{
+	public partial class EmbeddedFontLoader : IEmbeddedFontLoader
+	{
+		readonly ILogger<EmbeddedFontLoader>? _logger;
+
+#if !NET6_0
+		// The NET6_0 linker won't need this
+		// Make sure to test with full linking on before removing
+#if __ANDROID__
+		[Android.Runtime.Preserve]
+#elif __IOS__
+		[Foundation.Preserve]
+#endif
+#endif
+		public EmbeddedFontLoader()
+			: this(null)
+		{
+		}
+
+		public EmbeddedFontLoader(ILogger<EmbeddedFontLoader>? logger = null)
+#if __ANDROID__
+			: base(Path.GetTempPath(), logger)
+#endif
+		{
+			_logger = logger;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Fonts/EmbeddedFontLoader.iOS.cs b/src/Core/src/Fonts/EmbeddedFontLoader.iOS.cs
index 2f2ce8706b77..d9de19008df7 100644
--- a/src/Core/src/Fonts/EmbeddedFontLoader.iOS.cs
+++ b/src/Core/src/Fonts/EmbeddedFontLoader.iOS.cs
@@ -1,26 +1,16 @@
+#nullable enable
 using System;
-using System.Diagnostics;
 using CoreGraphics;
 using CoreText;
 using Foundation;
+using Microsoft.Extensions.Logging;
 using UIKit;
 
 namespace Microsoft.Maui
 {
-	public class EmbeddedFontLoader : IEmbeddedFontLoader
+	public partial class EmbeddedFontLoader
 	{
-
-#if !NET6_0
-		// The NET6_0 linker won't need this
-		// Make sure to test with full linking on before removing
-		[Preserve]
-		public EmbeddedFontLoader()
-		{
-
-		}
-#endif
-
-		public (bool success, string? filePath) LoadFont(EmbeddedFont font)
+		public string? LoadFont(EmbeddedFont font)
 		{
 			try
 			{
@@ -29,26 +19,24 @@ public EmbeddedFontLoader()
 
 				var data = NSData.FromStream(font.ResourceStream);
 				var provider = new CGDataProvider(data);
-				var cGFont = CGFont.CreateFromProvider(provider);
-				var name = cGFont.PostScriptName;
-				if (CTFontManager.RegisterGraphicsFont(cGFont, out var error))
-				{
-					return (true, name);
-				}
-				else //Lets check if the font is already registered
-				{
-					var uiFont = UIFont.FromName(name, 10);
-					if (uiFont != null)
-						return (true, name);
-				}
-				Debug.WriteLine(error.Description);
+				var cgFont = CGFont.CreateFromProvider(provider);
+				var name = cgFont.PostScriptName;
+
+				if (CTFontManager.RegisterGraphicsFont(cgFont, out var error))
+					return name;
+
+				var uiFont = UIFont.FromName(name, 10);
+				if (uiFont != null)
+					return name;
+
+				throw new NSErrorException(error);
 			}
 			catch (Exception ex)
 			{
-				Debug.WriteLine(ex);
+				_logger?.LogWarning(ex, "Unable register font {Font} with the system.", font.FontName);
 			}
 
-			return (false, null);
+			return null;
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Fonts/FileSystemEmbeddedFontLoader.cs b/src/Core/src/Fonts/FileSystemEmbeddedFontLoader.cs
index b90b4dfda35d..ac8a11b770d7 100644
--- a/src/Core/src/Fonts/FileSystemEmbeddedFontLoader.cs
+++ b/src/Core/src/Fonts/FileSystemEmbeddedFontLoader.cs
@@ -1,24 +1,26 @@
 #nullable enable
 using System;
-using System.Diagnostics;
 using System.IO;
+using Microsoft.Extensions.Logging;
 
 namespace Microsoft.Maui
 {
 	public class FileSystemEmbeddedFontLoader : IEmbeddedFontLoader
 	{
 		readonly string _rootPath;
+		readonly ILogger<EmbeddedFontLoader>? _logger;
 
-		public FileSystemEmbeddedFontLoader(string rootPath)
+		public FileSystemEmbeddedFontLoader(string rootPath, ILogger<EmbeddedFontLoader>? logger = null)
 		{
 			_rootPath = rootPath;
+			_logger = logger;
 		}
 
-		public (bool success, string? filePath) LoadFont(EmbeddedFont font)
+		public string? LoadFont(EmbeddedFont font)
 		{
 			var filePath = Path.Combine(_rootPath, font.FontName!);
 			if (File.Exists(filePath))
-				return (true, filePath);
+				return filePath;
 
 			try
 			{
@@ -33,15 +35,16 @@ public FileSystemEmbeddedFontLoader(string rootPath)
 					font.ResourceStream.CopyTo(fileStream);
 				}
 
-				return (true, filePath);
+				return filePath;
 			}
 			catch (Exception ex)
 			{
-				Debug.WriteLine(ex);
+				_logger?.LogWarning(ex, "Unable copy font {Font} to local file system.", font.FontName);
+
 				File.Delete(filePath);
 			}
 
-			return (false, null);
+			return null;
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Fonts/FontManager.Android.cs b/src/Core/src/Fonts/FontManager.Android.cs
index cfee13c1c08c..c7fb00972aaf 100644
--- a/src/Core/src/Fonts/FontManager.Android.cs
+++ b/src/Core/src/Fonts/FontManager.Android.cs
@@ -1,130 +1,100 @@
 using System;
 using System.Collections.Concurrent;
-using System.Diagnostics;
 using Android.Graphics;
+using Microsoft.Extensions.Logging;
 using AApplication = Android.App.Application;
 
 namespace Microsoft.Maui
 {
 	public class FontManager : IFontManager
 	{
-		readonly ConcurrentDictionary<(string fontFamily, FontAttributes fontAttributes), Typeface?> _typefaces =
-			new ConcurrentDictionary<(string fontFamily, FontAttributes fontAttributes), Typeface?>();
+		static readonly string[] FontFolders = new[]
+		{
+			"",
+			"Fonts/",
+			"fonts/",
+		};
 
+		readonly ConcurrentDictionary<(string fontFamilyName, FontWeight weight, bool italic), Typeface?> _typefaces = new();
 		readonly IFontRegistrar _fontRegistrar;
+		readonly ILogger<FontManager>? _logger;
 
 		Typeface? _defaultTypeface;
 
-		public FontManager(IFontRegistrar fontRegistrar)
+		public FontManager(IFontRegistrar fontRegistrar, ILogger<FontManager>? logger = null)
 		{
 			_fontRegistrar = fontRegistrar;
+			_logger = logger;
 		}
 
 		public Typeface DefaultTypeface => _defaultTypeface ??= Typeface.Default!;
 
 		public Typeface? GetTypeface(Font font)
 		{
-			if (font.IsDefault || (font.FontAttributes == FontAttributes.None && string.IsNullOrEmpty(font.FontFamily)))
+			if (font == Font.Default || (font.Weight == FontWeight.Regular && string.IsNullOrEmpty(font.FontFamily) && font.FontSlant == FontSlant.Default))
 				return DefaultTypeface;
 
-			return _typefaces.GetOrAdd((font.FontFamily, font.FontAttributes), CreateTypeface);
+			return _typefaces.GetOrAdd((font.FontFamily, font.Weight, font.FontSlant != FontSlant.Default), CreateTypeface);
 		}
 
-		public float GetScaledPixel(Font font)
-		{
-			if (font.IsDefault)
-				return 14;
-
-			if (font.UseNamedSize)
-			{
-				switch (font.NamedSize)
-				{
-					case NamedSize.Micro:
-						return 10;
-
-					case NamedSize.Small:
-						return 12;
-
-					case NamedSize.Default:
-					case NamedSize.Medium:
-						return 14;
+		public float GetFontSize(Font font, float defaultFontSize = 0) =>
+			font.FontSize <= 0
+				? (defaultFontSize > 0 ? defaultFontSize : 14f)
+				: (float)font.FontSize;
 
-					case NamedSize.Large:
-						return 18;
-				}
-			}
-
-			return (float)font.FontSize;
-		}
 
-		(bool success, Typeface? typeface) TryGetFromAssets(string fontName)
+		Typeface? GetFromAssets(string fontName)
 		{
-			//First check Alias
-			var (hasFontAlias, fontPostScriptName) = _fontRegistrar.HasFont(fontName);
-			if (hasFontAlias)
-				return (true, Typeface.CreateFromFile(fontPostScriptName));
+			// First check Alias
+			if (_fontRegistrar.GetFont(fontName) is string fontPostScriptName)
+				return Typeface.CreateFromFile(fontPostScriptName);
 
 			var isAssetFont = IsAssetFontFamily(fontName);
 			if (isAssetFont)
-			{
 				return LoadTypefaceFromAsset(fontName);
-			}
-
-			var folders = new[]
-			{
-				"",
-				"Fonts/",
-				"fonts/",
-			};
 
-			//copied text
+			// copied text
 			var fontFile = FontFile.FromString(fontName);
 
 			if (!string.IsNullOrWhiteSpace(fontFile.Extension))
 			{
-				var (hasFont, fontPath) = _fontRegistrar.HasFont(fontFile.FileNameWithExtension());
-				if (hasFont)
-				{
-					return (true, Typeface.CreateFromFile(fontPath));
-				}
+				if (_fontRegistrar.GetFont(fontFile.FileNameWithExtension()) is string fontPath)
+					return Typeface.CreateFromFile(fontPath);
 			}
 			else
 			{
 				foreach (var ext in FontFile.Extensions)
 				{
-					var formated = fontFile.FileNameWithExtension(ext);
-					var (hasFont, fontPath) = _fontRegistrar.HasFont(formated);
-					if (hasFont)
-					{
-						return (true, Typeface.CreateFromFile(fontPath));
-					}
+					var formatted = fontFile.FileNameWithExtension(ext);
+					if (_fontRegistrar.GetFont(formatted) is string fontPath)
+						return Typeface.CreateFromFile(fontPath);
 
-					foreach (var folder in folders)
+					foreach (var folder in FontFolders)
 					{
-						formated = $"{folder}{fontFile.FileNameWithExtension()}#{fontFile.PostScriptName}";
-						var result = LoadTypefaceFromAsset(formated);
-						if (result.success)
+						formatted = $"{folder}{fontFile.FileNameWithExtension()}#{fontFile.PostScriptName}";
+						var result = LoadTypefaceFromAsset(formatted, false);
+						if (result != null)
 							return result;
 					}
-
 				}
 			}
 
-			return (false, null);
+			return null;
 		}
 
-		(bool success, Typeface? typeface) LoadTypefaceFromAsset(string fontfamily)
+		Typeface? LoadTypefaceFromAsset(string fontfamily, bool warning = true)
 		{
 			try
 			{
-				var result = Typeface.CreateFromAsset(AApplication.Context.Assets, FontNameToFontFile(fontfamily));
-				return (true, result);
+				return Typeface.CreateFromAsset(AApplication.Context.Assets, FontNameToFontFile(fontfamily));
 			}
 			catch (Exception ex)
 			{
-				Debug.WriteLine(ex);
-				return (false, null);
+				if (warning)
+					_logger?.LogWarning(ex, "Unable to load font '{Font}' from assets.", fontfamily);
 			}
+
+			return null;
 		}
 
 		bool IsAssetFontFamily(string name)
@@ -132,48 +102,46 @@ bool IsAssetFontFamily(string name)
 			return name != null && (name.Contains(".ttf#") || name.Contains(".otf#"));
 		}
 
-		Typeface? CreateTypeface((string fontFamily, FontAttributes fontAttributes) familyAttributePair)
+		Typeface? CreateTypeface((string fontFamilyName, FontWeight weight, bool italic) fontData)
 		{
-			var (fontFamily, fontAttributes) = familyAttributePair;
+			var (fontFamily, weight, italic) = fontData;
 			fontFamily ??= string.Empty;
+			var style = ToTypefaceStyle(weight, italic);
 
-			Typeface? result;
+			var result = Typeface.Default;
 
-			if (string.IsNullOrWhiteSpace(fontFamily))
+			if (!string.IsNullOrWhiteSpace(fontFamily))
 			{
-				var style = ToTypefaceStyle(fontAttributes);
-				result = Typeface.Create(Typeface.Default, style);
-			}
-			else if (IsAssetFontFamily(fontFamily))
-			{
-				result = Typeface.CreateFromAsset(AApplication.Context.Assets, FontNameToFontFile(fontFamily));
-			}
-			else
-			{
-				fontFamily ??= string.Empty;
-				var (success, typeface) = TryGetFromAssets(fontFamily);
-				if (success)
+				if (IsAssetFontFamily(fontFamily))
 				{
-					return typeface;
+					result = Typeface.CreateFromAsset(AApplication.Context.Assets, FontNameToFontFile(fontFamily));
 				}
 				else
 				{
-					var style = ToTypefaceStyle(fontAttributes);
-					return Typeface.Create(fontFamily, style);
+					if (GetFromAssets(fontFamily) is Typeface typeface)
+						result = typeface;
+					else
+						result = Typeface.Create(fontFamily, style);
 				}
 			}
 
+			if (NativeVersion.IsAtLeast(28))
+				result = Typeface.Create(result, (int)weight, italic);
+			else
+				result = Typeface.Create(result, style);
+
 			return result;
 		}
 
-		TypefaceStyle ToTypefaceStyle(FontAttributes attrs)
+		TypefaceStyle ToTypefaceStyle(FontWeight weight, bool italic)
 		{
 			var style = TypefaceStyle.Normal;
-			if ((attrs & (FontAttributes.Bold | FontAttributes.Italic)) == (FontAttributes.Bold | FontAttributes.Italic))
+			var bold = weight >= FontWeight.Bold;
+			if (bold && italic)
 				style = TypefaceStyle.BoldItalic;
-			else if ((attrs & FontAttributes.Bold) != 0)
+			else if (bold)
 				style = TypefaceStyle.Bold;
-			else if ((attrs & FontAttributes.Italic) != 0)
+			else if (italic)
 				style = TypefaceStyle.Italic;
 			return style;
 		}
diff --git a/src/Core/src/Fonts/FontManager.Standard.cs b/src/Core/src/Fonts/FontManager.Standard.cs
index 1d2fd5fec0c0..f45c074f4fa4 100644
--- a/src/Core/src/Fonts/FontManager.Standard.cs
+++ b/src/Core/src/Fonts/FontManager.Standard.cs
@@ -1,8 +1,11 @@
-namespace Microsoft.Maui
+#nullable enable
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.Maui
 {
 	public class FontManager : IFontManager
 	{
-		public FontManager(IFontRegistrar fontRegistrar)
+		public FontManager(IFontRegistrar fontRegistrar, ILogger<FontManager>? logger = null)
 		{
 		}
 	}
diff --git a/src/Core/src/Fonts/FontManager.Windows.cs b/src/Core/src/Fonts/FontManager.Windows.cs
index 811f6b43abfc..451cbb53065e 100644
--- a/src/Core/src/Fonts/FontManager.Windows.cs
+++ b/src/Core/src/Fonts/FontManager.Windows.cs
@@ -2,9 +2,9 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using Microsoft.Extensions.Logging;
 using Microsoft.Graphics.Canvas.Text;
 using Microsoft.UI.Xaml.Media;
 
@@ -22,14 +22,14 @@ public class FontManager : IFontManager
 			".otf",
 		};
 
-		readonly ConcurrentDictionary<string, FontFamily> _fonts =
-			new ConcurrentDictionary<string, FontFamily>();
-
+		readonly ConcurrentDictionary<string, FontFamily> _fonts = new();
 		readonly IFontRegistrar _fontRegistrar;
+		readonly ILogger<FontManager>? _logger;
 
-		public FontManager(IFontRegistrar fontRegistrar)
+		public FontManager(IFontRegistrar fontRegistrar, ILogger<FontManager>? logger = null)
 		{
 			_fontRegistrar = fontRegistrar;
+			_logger = logger;
 		}
 
 		public FontFamily DefaultFontFamily =>
@@ -46,34 +46,10 @@ public FontFamily GetFontFamily(Font font)
 			return _fonts.GetOrAdd(font.FontFamily, CreateFontFamily);
 		}
 
-		public double GetFontSize(Font font)
-		{
-			if (font.UseNamedSize)
-				return GetFontSize(font.NamedSize);
-
-			return font.FontSize;
-		}
-
-		public double GetFontSize(NamedSize namedSize)
-		{
-			// TODO: Hmm, maybe we need to revisit this, since we no longer support Windows Phone OR WinRT.
-			// These are values pulled from the mapped sizes on Windows Phone, WinRT has no equivalent sizes, only intents.
-
-			return namedSize switch
-			{
-				NamedSize.Default => DefaultFontSize,
-				NamedSize.Micro => 15.667,
-				NamedSize.Small => 18.667,
-				NamedSize.Medium => 22.667,
-				NamedSize.Large => 32,
-				NamedSize.Body => 14,
-				NamedSize.Caption => 12,
-				NamedSize.Header => 46,
-				NamedSize.Subtitle => 20,
-				NamedSize.Title => 24,
-				_ => throw new ArgumentOutOfRangeException(nameof(namedSize)),
-			};
-		}
+		public double GetFontSize(Font font, double defaultFontSize = 0) =>
+			font.FontSize <= 0
+				? (defaultFontSize > 0 ? defaultFontSize : DefaultFontSize)
+				: font.FontSize;
 
 		FontFamily CreateFontFamily(string fontFamily)
 		{
@@ -87,7 +63,7 @@ FontFamily CreateFontFamily(string fontFamily)
 		IEnumerable<string> GetAllFontPossibilities(string fontFamily)
 		{
 			// First check Alias
-			if (_fontRegistrar.TryGetFont(fontFamily, out var fontPostScriptName))
+			if (_fontRegistrar.GetFont(fontFamily) is string fontPostScriptName)
 			{
 				if (fontPostScriptName!.Contains("://") && fontPostScriptName.Contains("#"))
 				{
@@ -111,8 +87,7 @@ IEnumerable<string> GetAllFontPossibilities(string fontFamily)
 			var hasExtension = !string.IsNullOrWhiteSpace(fontFile.Extension);
 			if (hasExtension)
 			{
-				var (hasFont, filePath) = _fontRegistrar.HasFont(fontFile.FileNameWithExtension());
-				if (hasFont)
+				if (_fontRegistrar.GetFont(fontFile.FileNameWithExtension()) is string filePath)
 				{
 					var familyName = FindFontFamilyName(filePath);
 					var formatted = $"{filePath}#{familyName ?? fontFile.GetPostScriptNameWithSpaces()}";
@@ -129,8 +104,7 @@ IEnumerable<string> GetAllFontPossibilities(string fontFamily)
 			// There was no extension so let's just try a few things
 			foreach (var ext in TypicalFontFileExtensions)
 			{
-				var (hasFont, filePath) = _fontRegistrar.HasFont(fontFile.FileNameWithExtension(ext));
-				if (hasFont)
+				if (_fontRegistrar.GetFont(fontFile.FileNameWithExtension(ext)) is string filePath)
 				{
 					var familyName = FindFontFamilyName(filePath);
 					var formatted = $"{filePath}#{familyName ?? fontFile.GetPostScriptNameWithSpaces()}";
@@ -178,7 +152,8 @@ IEnumerable<string> GetAllFontPossibilities(string fontFamily)
 			catch (Exception ex)
 			{
 				// the CanvasFontSet constructor can throw an exception in case something's wrong with the font. It should not crash the app
-				Debug.WriteLine("Font", $"Error loading font {fontFile}: {ex.Message}");
+
+				_logger?.LogError(ex, "Error loading font '{Font}'.", fontFile);
 
 				return null;
 			}
diff --git a/src/Core/src/Fonts/FontManager.iOS.cs b/src/Core/src/Fonts/FontManager.iOS.cs
index 1138e5088057..d685b00ca615 100644
--- a/src/Core/src/Fonts/FontManager.iOS.cs
+++ b/src/Core/src/Fonts/FontManager.iOS.cs
@@ -1,93 +1,128 @@
 using System;
 using System.Collections.Concurrent;
-using System.Diagnostics;
 using System.Linq;
+using Microsoft.Extensions.Logging;
 using UIKit;
 
 namespace Microsoft.Maui
 {
 	public class FontManager : IFontManager
 	{
-		readonly ConcurrentDictionary<(string family, float size, FontAttributes attributes), UIFont> _fonts =
-			new ConcurrentDictionary<(string family, float size, FontAttributes attributes), UIFont>();
-
+		// UIFontWeight[Constant] is internal in Xamarin.iOS but the convertion from
+		// the public (int-based) enum is not helpful in this case.
+		// -1.0 (Thin / 100) to 1.0 (Black / 900) with 0 being Regular (400)
+		// which is not quite the center, not are the constant values linear
+		static readonly (float value, FontWeight weight)[] FontWeightMap = new (float, FontWeight)[] {
+			(-0.80f, FontWeight.Ultralight),
+			(-0.60f, FontWeight.Thin),
+			(-0.40f, FontWeight.Light),
+			(0.0f, FontWeight.Regular),
+			(0.23f, FontWeight.Medium),
+			(0.30f, FontWeight.Semibold),
+			(0.40f, FontWeight.Bold),
+			(0.56f, FontWeight.Heavy),
+			(0.62f, FontWeight.Black)
+		};
+
+		readonly ConcurrentDictionary<Font, UIFont> _fonts = new();
 		readonly IFontRegistrar _fontRegistrar;
+		readonly ILogger<FontManager>? _logger;
 
 		UIFont? _defaultFont;
 
-		public FontManager(IFontRegistrar fontRegistrar)
+		public FontManager(IFontRegistrar fontRegistrar, ILogger<FontManager>? logger = null)
 		{
 			_fontRegistrar = fontRegistrar;
+			_logger = logger;
 		}
 
 		public UIFont DefaultFont =>
-			_defaultFont ??= UIFont.SystemFontOfSize(12);
+			_defaultFont ??= UIFont.SystemFontOfSize(UIFont.SystemFontSize);
+
+		public UIFont GetFont(Font font, double defaultFontSize = 0) =>
+			GetFont(font, defaultFontSize, CreateFont);
 
-		public UIFont GetFont(Font font)
+		public double GetFontSize(Font font, double defaultFontSize = 0) =>
+			font.FontSize <= 0
+				? (defaultFontSize > 0 ? (float)defaultFontSize : DefaultFont.PointSize)
+				: (nfloat)font.FontSize;
+
+		static float GetWeightConstant(FontWeight self)
 		{
-			var size = (float)font.FontSize;
-			if (font.UseNamedSize)
+			foreach (var (value, weight) in FontWeightMap)
 			{
-				switch (font.NamedSize)
-				{
-					case NamedSize.Micro:
-						size = 12;
-						break;
-					case NamedSize.Small:
-						size = 14;
-						break;
-					case NamedSize.Medium:
-						size = 17; // as defined by iOS documentation
-						break;
-					case NamedSize.Large:
-						size = 22;
-						break;
-					default:
-						size = 17;
-						break;
-				}
+				if (self <= weight)
+					return value;
 			}
+			return 1.0f;
+		}
 
-			return GetFont(font.FontFamily, size, font.FontAttributes, CreateFont);
+		UIFont GetFont(Font font, double defaultFont, Func<Font, UIFont> factory)
+		{
+			var size = GetFontSize(font, defaultFont);
+			if (size != font.FontSize)
+				font = font.WithSize(size);
+			return _fonts.GetOrAdd(font, factory);
 		}
 
-		UIFont GetFont(string family, float size, FontAttributes attributes, Func<(string, float, FontAttributes), UIFont> factory)
+		static UIFontAttributes GetFontAttributes(Font font)
 		{
-			return _fonts.GetOrAdd((family, size, attributes), factory);
+			var a = new UIFontAttributes
+			{
+				Traits = new UIFontTraits(),
+			};
+			var weight = font.Weight;
+			if (font.Weight == 0)
+				weight = FontWeight.Regular;
+			var traits = (UIFontDescriptorSymbolicTraits)0;
+			if (weight == FontWeight.Bold)
+				traits |= UIFontDescriptorSymbolicTraits.Bold;
+			else if (weight != FontWeight.Regular)
+			{
+				a.Traits = new UIFontTraits
+				{
+					Weight = GetWeightConstant(font.Weight),
+					Slant = font.FontSlant == FontSlant.Oblique ? 30.0f : 0.0f
+				};
+			}
+			if (font.FontSlant == FontSlant.Italic)
+				traits |= UIFontDescriptorSymbolicTraits.Italic;
+
+			a.Traits.SymbolicTrait = traits;
+			return a;
 		}
 
-		UIFont CreateFont((string family, float size, FontAttributes attributes) fontKey)
+		UIFont CreateFont(Font font)
 		{
-			var (family, size, attributes) = fontKey;
-			var bold = (attributes & FontAttributes.Bold) != 0;
-			var italic = (attributes & FontAttributes.Italic) != 0;
+			var family = font.FontFamily;
+			var size = (nfloat)font.FontSize;
+
+			var hasAttributes =
+				font.Weight != FontWeight.Regular ||
+				font.FontSlant != FontSlant.Default;
 
 			if (family != null && family != DefaultFont.FamilyName)
 			{
 				try
 				{
 					UIFont? result = null;
+
 					if (UIFont.FamilyNames.Contains(family))
 					{
 						var descriptor = new UIFontDescriptor().CreateWithFamily(family);
+						if (hasAttributes)
+							descriptor = descriptor.CreateWithAttributes(GetFontAttributes(font));
 
-						if (bold || italic)
-						{
-							var traits = (UIFontDescriptorSymbolicTraits)0;
-							if (bold)
-								traits |= UIFontDescriptorSymbolicTraits.Bold;
-							if (italic)
-								traits |= UIFontDescriptorSymbolicTraits.Italic;
-
-							descriptor = descriptor.CreateWithTraits(traits);
-							result = UIFont.FromDescriptor(descriptor, size);
-							if (result != null)
-								return result;
-						}
+						result = UIFont.FromDescriptor(descriptor, size);
+						if (result != null)
+							return result;
 					}
 
 					var cleansedFont = CleanseFontName(family);
 					result = UIFont.FromName(cleansedFont, size);
+					if (result != null)
+						return result;
+
 					if (family.StartsWith(".SFUI", StringComparison.InvariantCultureIgnoreCase))
 					{
 						var fontWeight = family.Split('-').LastOrDefault();
@@ -95,63 +130,54 @@ UIFont CreateFont((string family, float size, FontAttributes attributes) fontKey
 						if (!string.IsNullOrWhiteSpace(fontWeight) && Enum.TryParse<UIFontWeight>(fontWeight, true, out var uIFontWeight))
 						{
 							result = UIFont.SystemFontOfSize(size, uIFontWeight);
-							return result;
+							if (result != null)
+								return result;
 						}
 
 						result = UIFont.SystemFontOfSize(size, UIFontWeight.Regular);
-						return result;
+						if (result != null)
+							return result;
 					}
-					if (result == null)
-						result = UIFont.FromName(family, size);
+
+					result = UIFont.FromName(family, size);
 					if (result != null)
 						return result;
 				}
-				catch
+				catch (Exception ex)
 				{
-					Debug.WriteLine("Could not load font named: {0}", family);
+					_logger?.LogWarning(ex, "Unable to load font '{Font}'.", family);
 				}
 			}
 
-			if (bold && italic)
+			if (hasAttributes)
 			{
 				var defaultFont = UIFont.SystemFontOfSize(size);
-
-				var descriptor = defaultFont.FontDescriptor.CreateWithTraits(UIFontDescriptorSymbolicTraits.Bold | UIFontDescriptorSymbolicTraits.Italic);
-				return UIFont.FromDescriptor(descriptor, 0);
+				var descriptor = defaultFont.FontDescriptor.CreateWithAttributes(GetFontAttributes(font));
+				return UIFont.FromDescriptor(descriptor, size);
 			}
 
-			if (italic)
-				return UIFont.ItalicSystemFontOfSize(size);
-
-			if (bold)
-				return UIFont.BoldSystemFontOfSize(size);
-
 			return UIFont.SystemFontOfSize(size);
 		}
 
 		string? CleanseFontName(string fontName)
 		{
 			// First check Alias
-			var (hasFontAlias, fontPostScriptName) = _fontRegistrar.HasFont(fontName);
-			if (hasFontAlias)
+			if (_fontRegistrar.GetFont(fontName) is string fontPostScriptName)
 				return fontPostScriptName;
 
 			var fontFile = FontFile.FromString(fontName);
 
 			if (!string.IsNullOrWhiteSpace(fontFile.Extension))
 			{
-				var (hasFont, filePath) = _fontRegistrar.HasFont(fontFile.FileNameWithExtension());
-				if (hasFont)
+				if (_fontRegistrar.GetFont(fontFile.FileNameWithExtension()) is string filePath)
 					return filePath ?? fontFile.PostScriptName;
 			}
 			else
 			{
 				foreach (var ext in FontFile.Extensions)
 				{
-
-					var formated = fontFile.FileNameWithExtension(ext);
-					var (hasFont, filePath) = _fontRegistrar.HasFont(formated);
-					if (hasFont)
+					var formatted = fontFile.FileNameWithExtension(ext);
+					if (_fontRegistrar.GetFont(formatted) is string filePath)
 						return filePath;
 				}
 			}
diff --git a/src/Core/src/Fonts/FontRegistrar.Android.cs b/src/Core/src/Fonts/FontRegistrar.Android.cs
new file mode 100644
index 000000000000..7d4a0d7ce3ce
--- /dev/null
+++ b/src/Core/src/Fonts/FontRegistrar.Android.cs
@@ -0,0 +1,27 @@
+#nullable enable
+using System.IO;
+
+namespace Microsoft.Maui
+{
+	public partial class FontRegistrar : IFontRegistrar
+	{
+		string? LoadNativeAppFont(string font, string filename, string? alias)
+		{
+			using var stream = GetNativeFontStream(filename, alias);
+
+			return LoadEmbeddedFont(font, filename, alias, stream);
+		}
+
+		Stream GetNativeFontStream(string filename, string? alias)
+		{
+			var assets = Android.App.Application.Context.Assets;
+
+			if (assets != null && assets.Open(filename) is Stream assetStream)
+				return assetStream;
+
+			// TODO: check other folders as well
+
+			throw new FileNotFoundException($"Native font with the name {filename} was not found.");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Fonts/FontRegistrar.Standard.cs b/src/Core/src/Fonts/FontRegistrar.Standard.cs
new file mode 100644
index 000000000000..34135a35ebbb
--- /dev/null
+++ b/src/Core/src/Fonts/FontRegistrar.Standard.cs
@@ -0,0 +1,9 @@
+#nullable enable
+
+namespace Microsoft.Maui
+{
+	public partial class FontRegistrar : IFontRegistrar
+	{
+		string? LoadNativeAppFont(string font, string filename, string? alias) => null;
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Fonts/FontRegistrar.Windows.cs b/src/Core/src/Fonts/FontRegistrar.Windows.cs
new file mode 100644
index 000000000000..d6f764174793
--- /dev/null
+++ b/src/Core/src/Fonts/FontRegistrar.Windows.cs
@@ -0,0 +1,29 @@
+#nullable enable
+using System.IO;
+
+namespace Microsoft.Maui
+{
+	public partial class FontRegistrar : IFontRegistrar
+	{
+		string? LoadNativeAppFont(string font, string filename, string? alias)
+		{
+			var root = Windows.ApplicationModel.Package.Current.InstalledLocation.Path;
+
+			var packagePath = Path.Combine(root, "Assets", filename);
+			if (File.Exists(packagePath))
+				return $"ms-appx:///Assets/{filename}";
+
+			packagePath = Path.Combine(root, "Fonts", filename);
+			if (File.Exists(packagePath))
+				return $"ms-appx:///Fonts/{filename}";
+
+			packagePath = Path.Combine(root, "Assets", "Fonts", filename);
+			if (File.Exists(packagePath))
+				return $"ms-appx:///Assets/Fonts/{filename}";
+
+			// TODO: check other folders as well
+
+			throw new FileNotFoundException($"Native font with the name {filename} was not found.");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Fonts/FontRegistrar.cs b/src/Core/src/Fonts/FontRegistrar.cs
index c0fbc02cbc7c..04fad8a240ca 100644
--- a/src/Core/src/Fonts/FontRegistrar.cs
+++ b/src/Core/src/Fonts/FontRegistrar.cs
@@ -1,29 +1,26 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using Microsoft.Extensions.Logging;
 
 namespace Microsoft.Maui
 {
-	public class FontRegistrar : IFontRegistrar
+	public partial class FontRegistrar : IFontRegistrar
 	{
-		readonly Dictionary<string, (string Filename, string? Alias, Assembly Assembly)> _embeddedFonts =
-			new Dictionary<string, (string Filename, string? Alias, Assembly Assembly)>();
-
-		readonly Dictionary<string, (string Filename, string? Alias)> _nativeFonts =
-			new Dictionary<string, (string Filename, string? Alias)>();
-
-		readonly Dictionary<string, (bool Success, string? Path)> _fontLookupCache =
-			new Dictionary<string, (bool Success, string? Path)>();
+		readonly Dictionary<string, (string Filename, string? Alias, Assembly Assembly)> _embeddedFonts = new();
+		readonly Dictionary<string, (string Filename, string? Alias)> _nativeFonts = new();
+		readonly Dictionary<string, string?> _fontLookupCache = new();
+		readonly ILogger<FontRegistrar>? _logger;
 
 		IEmbeddedFontLoader? _fontLoader;
 
-		public FontRegistrar(IEmbeddedFontLoader? fontLoader = null)
+		public FontRegistrar(IEmbeddedFontLoader? fontLoader = null, ILogger<FontRegistrar>? logger = null)
 		{
 			_fontLoader = fontLoader;
+			_logger = logger;
 		}
 
 		public void SetFontLoader(IEmbeddedFontLoader? fontLoader)
@@ -47,7 +44,7 @@ public void Register(string filename, string? alias)
 				_nativeFonts[alias!] = (filename, alias);
 		}
 
-		public (bool hasFont, string? fontPath) HasFont(string font)
+		public string? GetFont(string font)
 		{
 			if (_fontLookupCache.TryGetValue(font, out var foundResult))
 				return foundResult;
@@ -58,33 +55,22 @@ public void Register(string filename, string? alias)
 				{
 					using var stream = GetEmbeddedResourceStream(foundFont);
 
-					return TryLoadFont(font, foundFont.Filename, foundFont.Alias, stream);
+					return LoadEmbeddedFont(font, foundFont.Filename, foundFont.Alias, stream);
 				}
 				else if (_nativeFonts.TryGetValue(font, out var foundNativeFont))
 				{
-					if (CanUsePackagedNativeFonts)
-					{
-						var match = (true, GetNativeFontUri(foundNativeFont));
-						_fontLookupCache[font] = match;
-						return match;
-					}
-					else
-					{
-						using var stream = GetNativeFontStream(foundNativeFont);
-
-						return TryLoadFont(font, foundNativeFont.Filename, foundNativeFont.Alias, stream);
-					}
+					return LoadNativeAppFont(font, foundNativeFont.Filename, foundNativeFont.Alias);
 				}
 			}
 			catch (Exception ex)
 			{
-				Debug.WriteLine(ex);
+				_logger?.LogWarning(ex, "Unable to load font '{Font}'.", font);
 			}
 
-			return _fontLookupCache[font] = (false, null);
+			return _fontLookupCache[font] = null;
 		}
 
-		(bool hasFont, string? fontPath) TryLoadFont(string cacheKey, string filename, string? alias, Stream stream)
+		string? LoadEmbeddedFont(string cacheKey, string filename, string? alias, Stream stream)
 		{
 			var font = new EmbeddedFont { FontName = filename, ResourceStream = stream };
 
@@ -120,71 +106,5 @@ bool IsFile(string path, string file)
 
 			return path.Replace(file, "").EndsWith(".", StringComparison.Ordinal);
 		}
-
-		bool CanUsePackagedNativeFonts =>
-#if WINDOWS
-			true;
-#else
-			false;
-#endif
-
-		string GetNativeFontUri((string Filename, string? Alias) nativeFont)
-		{
-#if WINDOWS
-			var alias = nativeFont.Alias;
-			if (!string.IsNullOrEmpty(alias))
-				alias = "#" + alias;
-
-			var root = Windows.ApplicationModel.Package.Current.InstalledLocation.Path;
-
-			var packagePath = Path.Combine(root, "Assets", nativeFont.Filename);
-			if (File.Exists(packagePath))
-				return $"ms-appx:///Assets/{nativeFont.Filename}{alias}";
-
-			packagePath = Path.Combine(root, "Fonts", nativeFont.Filename);
-			if (File.Exists(packagePath))
-				return $"ms-appx:///Fonts/{nativeFont.Filename}{alias}";
-
-			packagePath = Path.Combine(root, "Assets", "Fonts", nativeFont.Filename);
-			if (File.Exists(packagePath))
-				return $"ms-appx:///Assets/Fonts/{nativeFont.Filename}{alias}";
-
-			// TODO: check other folders as well
-#endif
-
-			throw new FileNotFoundException($"Native font with the name {nativeFont.Filename} was not found.");
-		}
-
-		Stream GetNativeFontStream((string Filename, string? Alias) nativeFont)
-		{
-#if __IOS__ || IOS
-			var mainBundlePath = Foundation.NSBundle.MainBundle.BundlePath;
-
-			var fontBundlePath = Path.Combine(mainBundlePath, nativeFont.Filename);
-			if (File.Exists(fontBundlePath))
-				return File.OpenRead(fontBundlePath);
-
-			fontBundlePath = Path.Combine(mainBundlePath, "Resources", nativeFont.Filename);
-			if (File.Exists(fontBundlePath))
-				return File.OpenRead(fontBundlePath);
-
-			fontBundlePath = Path.Combine(mainBundlePath, "Fonts", nativeFont.Filename);
-			if (File.Exists(fontBundlePath))
-				return File.OpenRead(fontBundlePath);
-
-			fontBundlePath = Path.Combine(mainBundlePath, "Resources", "Fonts", nativeFont.Filename);
-			if (File.Exists(fontBundlePath))
-				return File.OpenRead(fontBundlePath);
-#elif __ANDROID__ || ANDROID
-			var assets = Android.App.Application.Context.Assets;
-
-			if (assets != null && assets.Open(nativeFont.Filename) is Stream assetStream)
-				return assetStream;
-
-			// TODO: check other folders as well
-#endif
-
-			throw new FileNotFoundException($"Native font with the name {nativeFont.Filename} was not found.");
-		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Fonts/FontRegistrar.iOS.cs b/src/Core/src/Fonts/FontRegistrar.iOS.cs
new file mode 100644
index 000000000000..40d6ab48ab5f
--- /dev/null
+++ b/src/Core/src/Fonts/FontRegistrar.iOS.cs
@@ -0,0 +1,40 @@
+#nullable enable
+using System.IO;
+
+namespace Microsoft.Maui
+{
+	public partial class FontRegistrar : IFontRegistrar
+	{
+		string? LoadNativeAppFont(string font, string filename, string? alias)
+		{
+			using var stream = GetNativeFontStream(filename, alias);
+
+			return LoadEmbeddedFont(font, filename, alias, stream);
+		}
+
+		Stream GetNativeFontStream(string filename, string? alias)
+		{
+			var mainBundlePath = Foundation.NSBundle.MainBundle.BundlePath;
+
+			var fontBundlePath = Path.Combine(mainBundlePath, filename);
+			if (File.Exists(fontBundlePath))
+				return File.OpenRead(fontBundlePath);
+
+			fontBundlePath = Path.Combine(mainBundlePath, "Resources", filename);
+			if (File.Exists(fontBundlePath))
+				return File.OpenRead(fontBundlePath);
+
+			fontBundlePath = Path.Combine(mainBundlePath, "Fonts", filename);
+			if (File.Exists(fontBundlePath))
+				return File.OpenRead(fontBundlePath);
+
+			fontBundlePath = Path.Combine(mainBundlePath, "Resources", "Fonts", filename);
+			if (File.Exists(fontBundlePath))
+				return File.OpenRead(fontBundlePath);
+
+			// TODO: check other folders as well
+
+			throw new FileNotFoundException($"Native font with the name {filename} was not found.");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Fonts/FontRegistrarExtensions.cs b/src/Core/src/Fonts/FontRegistrarExtensions.cs
deleted file mode 100644
index 45f59e7a0f71..000000000000
--- a/src/Core/src/Fonts/FontRegistrarExtensions.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-#nullable enable
-using System.Diagnostics.CodeAnalysis;
-
-namespace Microsoft.Maui
-{
-	public static class FontRegistrarExtensions
-	{
-		public static bool TryGetFont(this IFontRegistrar fontRegistrar, string font, out string? fontPath)
-		{
-			var (hasFont, foundFontPath) = fontRegistrar.HasFont(font);
-			if (hasFont)
-				fontPath = foundFontPath!;
-			else
-				fontPath = null;
-			return hasFont;
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/Core/src/Fonts/IEmbeddedFontLoader.cs b/src/Core/src/Fonts/IEmbeddedFontLoader.cs
index b6892b902359..aa4a5be2c935 100644
--- a/src/Core/src/Fonts/IEmbeddedFontLoader.cs
+++ b/src/Core/src/Fonts/IEmbeddedFontLoader.cs
@@ -3,6 +3,7 @@ namespace Microsoft.Maui
 {
 	public interface IEmbeddedFontLoader
 	{
-		(bool success, string? filePath) LoadFont(EmbeddedFont font);
+		// TODO: this should be async as it involves copying files
+		string? LoadFont(EmbeddedFont font);
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Fonts/IFontManager.Android.cs b/src/Core/src/Fonts/IFontManager.Android.cs
index 94acc7cd3fa6..183802ead0b9 100644
--- a/src/Core/src/Fonts/IFontManager.Android.cs
+++ b/src/Core/src/Fonts/IFontManager.Android.cs
@@ -8,6 +8,6 @@ public interface IFontManager
 
 		Typeface? GetTypeface(Font font);
 
-		float GetScaledPixel(Font font);
+		float GetFontSize(Font font, float defaultFontSize = 0);
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Fonts/IFontManager.Windows.cs b/src/Core/src/Fonts/IFontManager.Windows.cs
index ea9aeca5fc24..e121c2b2806d 100644
--- a/src/Core/src/Fonts/IFontManager.Windows.cs
+++ b/src/Core/src/Fonts/IFontManager.Windows.cs
@@ -10,6 +10,6 @@ public interface IFontManager
 
 		FontFamily GetFontFamily(Font font);
 
-		double GetFontSize(Font font);
+		double GetFontSize(Font font, double defaultFontSize = 0);
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Fonts/IFontManager.iOS.cs b/src/Core/src/Fonts/IFontManager.iOS.cs
index 364bbcd92606..3d2b6850d5e9 100644
--- a/src/Core/src/Fonts/IFontManager.iOS.cs
+++ b/src/Core/src/Fonts/IFontManager.iOS.cs
@@ -1,4 +1,5 @@
-using UIKit;
+using System;
+using UIKit;
 
 namespace Microsoft.Maui
 {
@@ -6,6 +7,8 @@ public interface IFontManager
 	{
 		UIFont DefaultFont { get; }
 
-		UIFont GetFont(Font font);
+		UIFont GetFont(Font font, double defaultFontSize = 0);
+
+		double GetFontSize(Font font, double defaultFontSize = 0);
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Fonts/IFontRegistrar.cs b/src/Core/src/Fonts/IFontRegistrar.cs
index 66bb43c28194..81fd54c285e5 100644
--- a/src/Core/src/Fonts/IFontRegistrar.cs
+++ b/src/Core/src/Fonts/IFontRegistrar.cs
@@ -9,7 +9,7 @@ public interface IFontRegistrar
 
 		void Register(string filename, string? alias);
 
-		//TODO: Investigate making this Async
-		(bool hasFont, string? fontPath) HasFont(string font);
+		// TODO: this should be async as it involves copying files
+		string? GetFont(string font);
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Graphics/GradientShaderFactory.Android.cs b/src/Core/src/Graphics/GradientShaderFactory.Android.cs
new file mode 100644
index 000000000000..190d97f62a02
--- /dev/null
+++ b/src/Core/src/Graphics/GradientShaderFactory.Android.cs
@@ -0,0 +1,111 @@
+using System;
+using Android.Graphics;
+using static Android.Graphics.Drawables.ShapeDrawable;
+
+namespace Microsoft.Maui.Graphics
+{
+	class LinearGradientShaderFactory : ShaderFactory
+	{
+		readonly LinearGradientData _data;
+
+		public LinearGradientShaderFactory(LinearGradientData data)
+		{
+			_data = data;
+		}
+
+		public override Shader? Resize(int width, int height)
+		{
+			if (width == 0 && height == 0)
+				return null;
+
+			if (_data.Colors == null || _data.Colors.Length < 2)
+				return null;
+
+			return new LinearGradient(
+				width * _data.X1,
+				height * _data.Y1,
+				width * _data.X2,
+				height * _data.Y2,
+				_data.Colors,
+				_data.Offsets,
+				Shader.TileMode.Clamp!);
+		}
+	}
+
+	class RadialGradientShaderFactory : ShaderFactory
+	{
+		readonly RadialGradientData _data;
+
+		public RadialGradientShaderFactory(RadialGradientData data)
+		{
+			_data = data;
+		}
+
+		public override Shader? Resize(int width, int height)
+		{
+			if (width == 0 && height == 0)
+				return null;
+
+			if (_data.Colors == null || _data.Colors.Length < 2)
+				return null;
+
+			return new RadialGradient(
+				width * _data.CenterX,
+				height * _data.CenterY,
+				Math.Max(height, width) * _data.Radius,
+				_data.Colors,
+				_data.Offsets,
+				Shader.TileMode.Clamp!);
+		}
+	}
+
+	class GradientData
+	{
+		public GradientData(int count)
+		{
+			Colors = new int[count];
+			Offsets = new float[count];
+		}
+
+		public GradientData(int[] colors, float[] offsets)
+		{
+			Colors = colors;
+			Offsets = offsets;
+		}
+
+		public int[] Colors { get; set; }
+		public float[] Offsets { get; set; }
+	}
+
+	class LinearGradientData : GradientData
+	{
+		public LinearGradientData(int[] colors, float[] offsets, float x1, float y1, float x2, float y2)
+			: base(colors, offsets)
+		{
+			X1 = x1;
+			Y1 = y1;
+			X2 = x2;
+			Y2 = y2;
+		}
+
+		public float X1 { get; set; }
+		public float Y1 { get; set; }
+		public float X2 { get; set; }
+		public float Y2 { get; set; }
+	}
+
+	class RadialGradientData : GradientData
+	{
+		public RadialGradientData(int[] colors, float[] offsets, float centerX, float centerY, float radius)
+			: base(colors, offsets)
+		{
+			CenterX = centerX;
+			CenterY = centerY;
+			Radius = radius;
+		}
+
+		public float CenterX { get; set; }
+		public float CenterY { get; set; }
+		public float Radius { get; set; }
+	}
+}
diff --git a/src/Core/src/Graphics/MauiDrawable.Android.cs b/src/Core/src/Graphics/MauiDrawable.Android.cs
new file mode 100644
index 000000000000..9698125ff22a
--- /dev/null
+++ b/src/Core/src/Graphics/MauiDrawable.Android.cs
@@ -0,0 +1,101 @@
+using System;
+using Android.Graphics;
+using Android.Graphics.Drawables;
+using Android.Graphics.Drawables.Shapes;
+using AColor = Android.Graphics.Color;
+
+namespace Microsoft.Maui.Graphics
+{
+	public class MauiDrawable : PaintDrawable
+	{
+		AColor? _backgroundColor;
+
+		public MauiDrawable()
+		{
+			Shape = new RectShape();
+		}
+
+		public void SetColor(AColor? backgroundColor)
+		{
+			_backgroundColor = backgroundColor;
+			SetShaderFactory(null);
+
+			InvalidateSelf();
+		}
+
+		public void SetPaint(SolidPaint solidPaint)
+		{
+			var color = solidPaint.Color == null
+				? (AColor?)null
+				: solidPaint.Color.ToNative();
+
+			SetColor(color);
+		}
+
+		public void SetPaint(LinearGradientPaint linearGradientPaint)
+		{
+			var p1 = linearGradientPaint.StartPoint;
+			var x1 = (float)p1.X;
+			var y1 = (float)p1.Y;
+
+			var p2 = linearGradientPaint.EndPoint;
+			var x2 = (float)p2.X;
+			var y2 = (float)p2.Y;
+
+			var data = GetGradientPaintData(linearGradientPaint);
+			var shader = new LinearGradientData(data.Colors, data.Offsets, x1, y1, x2, y2);
+
+			_backgroundColor = null;
+			SetShaderFactory(new LinearGradientShaderFactory(shader));
+		}
+
+		public void SetPaint(RadialGradientPaint radialGradientPaint)
+		{
+			var center = radialGradientPaint.Center;
+			float centerX = (float)center.X;
+			float centerY = (float)center.Y;
+			float radius = (float)radialGradientPaint.Radius;
+
+			var data = GetGradientPaintData(radialGradientPaint);
+			var shader = new RadialGradientData(data.Colors, data.Offsets, centerX, centerY, radius);
+
+			_backgroundColor = null;
+			SetShaderFactory(new RadialGradientShaderFactory(shader));
+		}
+
+		public void SetPaint(ImagePaint imagePaint)
+		{
+			throw new NotImplementedException();
+		}
+
+		public void SetPaint(PatternPaint patternPaint)
+		{
+			throw new NotImplementedException();
+		}
+
+		protected override void OnDraw(Shape? shape, Canvas? canvas, global::Android.Graphics.Paint? paint)
+		{
+			if (paint != null && _backgroundColor != null)
+				paint.Color = _backgroundColor.Value;
+
+			base.OnDraw(shape, canvas, paint);
+		}
+
+		static GradientData GetGradientPaintData(GradientPaint gradientPaint)
+		{
+			var orderStops = gradientPaint.GradientStops;
+
+			var data = new GradientData(orderStops.Length);
+
+			int count = 0;
+			foreach (var orderStop in orderStops)
+			{
+				data.Colors[count] = orderStop.Color.ToNative().ToArgb();
+				data.Offsets[count] = orderStop.Offset;
+				count++;
+			}
+
+			return data;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Graphics/PaintExtensions.Android.cs b/src/Core/src/Graphics/PaintExtensions.Android.cs
new file mode 100644
index 000000000000..93de6271d6b9
--- /dev/null
+++ b/src/Core/src/Graphics/PaintExtensions.Android.cs
@@ -0,0 +1,76 @@
+using Android.Graphics.Drawables;
+
+namespace Microsoft.Maui.Graphics
+{
+	public static partial class PaintExtensions
+	{
+		public static Drawable? ToDrawable(this Paint paint)
+		{
+			if (paint is SolidPaint solidPaint)
+				return solidPaint.CreateDrawable();
+
+			if (paint is LinearGradientPaint linearGradientPaint)
+				return linearGradientPaint.CreateDrawable();
+
+			if (paint is RadialGradientPaint radialGradientPaint)
+				return radialGradientPaint.CreateDrawable();
+
+			if (paint is ImagePaint imagePaint)
+				return imagePaint.CreateDrawable();
+
+			if (paint is PatternPaint patternPaint)
+				return patternPaint.CreateDrawable();
+
+			return null;
+		}
+
+		public static Drawable? CreateDrawable(this SolidPaint solidPaint)
+		{
+			var drawable = new MauiDrawable();
+			drawable.SetPaint(solidPaint);
+
+			return drawable;
+		}
+
+		public static Drawable? CreateDrawable(this LinearGradientPaint linearGradientPaint)
+		{
+			if (!linearGradientPaint.IsValid())
+				return null;
+
+			var drawable = new MauiDrawable();
+			drawable.SetPaint(linearGradientPaint);
+
+			return drawable;
+		}
+
+		public static Drawable? CreateDrawable(this RadialGradientPaint radialGradientPaint)
+		{
+			if (!radialGradientPaint.IsValid())
+				return null;
+
+			var drawable = new MauiDrawable();
+			drawable.SetPaint(radialGradientPaint);
+
+			return drawable;
+		}
+
+		public static Drawable? CreateDrawable(this ImagePaint imagePaint)
+		{
+			var drawable = new MauiDrawable();
+			drawable.SetPaint(imagePaint);
+
+			return drawable;
+		}
+
+		public static Drawable? CreateDrawable(this PatternPaint patternPaint)
+		{
+			var drawable = new MauiDrawable();
+			drawable.SetPaint(patternPaint);
+
+			return drawable;
+		}
+
+		static bool IsValid(this GradientPaint? gradienPaint) =>
+			gradienPaint?.GradientStops?.Length > 0;
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Graphics/PaintExtensions.Windows.cs b/src/Core/src/Graphics/PaintExtensions.Windows.cs
new file mode 100644
index 000000000000..c8abfd68b562
--- /dev/null
+++ b/src/Core/src/Graphics/PaintExtensions.Windows.cs
@@ -0,0 +1,95 @@
+#nullable enable
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using WBrush = Microsoft.UI.Xaml.Media.Brush;
+using WGradientStop = Microsoft.UI.Xaml.Media.GradientStop;
+using WLinearGradientBrush = Microsoft.UI.Xaml.Media.LinearGradientBrush;
+using WRadialGradientBrush = Microsoft.UI.Xaml.Media.RadialGradientBrush;
+using WSolidColorBrush = Microsoft.UI.Xaml.Media.SolidColorBrush;
+
+namespace Microsoft.Maui.Graphics
+{
+	public static partial class PaintExtensions
+	{
+		public static WBrush? ToNative(this Paint paint)
+		{
+			if (paint is SolidPaint solidPaint)
+				return solidPaint.CreateBrush();
+
+			if (paint is LinearGradientPaint linearGradientPaint)
+				return linearGradientPaint.CreateBrush();
+
+			if (paint is RadialGradientPaint radialGradientPaint)
+				return radialGradientPaint.CreateBrush();
+
+			if (paint is ImagePaint imagePaint)
+				return imagePaint.CreateBrush();
+			
+			if (paint is PatternPaint patternPaint)
+				return patternPaint.CreateBrush();
+
+			return null;
+		}
+
+		public static WBrush? CreateBrush(this SolidPaint solidPaint)
+		{
+			var brush = new WSolidColorBrush
+			{
+				Color = solidPaint.Color.ToWindowsColor()
+			};
+
+			return brush;
+		}
+
+		public static WBrush? CreateBrush(this LinearGradientPaint linearGradientPaint)
+		{
+			var brush = new WLinearGradientBrush
+			{
+				StartPoint = linearGradientPaint.StartPoint.ToNative(),
+				EndPoint = linearGradientPaint.EndPoint.ToNative()
+			};
+
+			brush.GradientStops.AddRange(linearGradientPaint.GradientStops);
+
+			return brush;
+		}
+
+		public static WBrush? CreateBrush(this RadialGradientPaint radialGradientPaint)
+		{
+			var brush = new WRadialGradientBrush
+			{
+				Center = radialGradientPaint.Center.ToNative(),
+				RadiusX = radialGradientPaint.Radius,
+				RadiusY = radialGradientPaint.Radius
+			};
+
+			brush.GradientStops.AddRange(radialGradientPaint.GradientStops);
+
+			return brush;
+		}
+
+		public static WBrush? CreateBrush(this ImagePaint imagePaint)
+		{
+			throw new NotImplementedException();
+		}
+
+		public static WBrush? CreateBrush(this PatternPaint patternPaint)
+		{
+			throw new NotImplementedException();
+		}
+
+		static void AddRange(this IList<WGradientStop> nativeStops, IEnumerable<GradientStop> stops)
+		{
+			foreach (var stop in stops.OrderBy(x => x.Offset))
+			{
+				var nativeStop = new WGradientStop
+				{
+					Color = stop.Color.ToWindowsColor(),
+					Offset = stop.Offset
+				};
+				nativeStops.Add(nativeStop);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Graphics/PaintExtensions.cs b/src/Core/src/Graphics/PaintExtensions.cs
new file mode 100644
index 000000000000..9be513548e78
--- /dev/null
+++ b/src/Core/src/Graphics/PaintExtensions.cs
@@ -0,0 +1,23 @@
+#nullable enable
+namespace Microsoft.Maui.Graphics
+{
+	public static partial class PaintExtensions
+	{
+		public static bool IsNullOrEmpty(this Paint? paint)
+		{
+			if (paint is SolidPaint solidPaint)
+				return solidPaint == null || solidPaint.Color == null;
+
+			if (paint is GradientPaint gradientPaint)
+				return gradientPaint == null || gradientPaint.GradientStops.Length == 0;
+
+			if (paint is ImagePaint imagePaint)
+				return imagePaint == null || imagePaint.Image == null;
+
+			if (paint is PatternPaint patternPaint)
+				return patternPaint == null || patternPaint.Pattern == null;
+
+			return paint == null;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Graphics/PaintExtensions.iOS.cs b/src/Core/src/Graphics/PaintExtensions.iOS.cs
new file mode 100644
index 000000000000..5a441a0f0fc2
--- /dev/null
+++ b/src/Core/src/Graphics/PaintExtensions.iOS.cs
@@ -0,0 +1,167 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using CoreAnimation;
+using CoreGraphics;
+using Foundation;
+
+namespace Microsoft.Maui.Graphics
+{
+	public static partial class PaintExtensions
+	{
+		public static CALayer? ToCALayer(this Paint paint, CGRect frame = default)
+		{
+			if (paint is SolidPaint solidPaint)
+				return solidPaint.CreateCALayer(frame);
+
+			if (paint is LinearGradientPaint linearGradientPaint)
+				return linearGradientPaint.CreateCALayer(frame);
+
+			if (paint is RadialGradientPaint radialGradientPaint)
+				return radialGradientPaint.CreateCALayer(frame);
+
+			if (paint is ImagePaint imagePaint)
+				return imagePaint.CreateCALayer(frame);
+
+			if (paint is PatternPaint patternPaint)
+				return patternPaint.CreateCALayer(frame);
+
+			return null;
+		}
+
+		public static CALayer? CreateCALayer(this SolidPaint solidPaint, CGRect frame = default)
+		{
+			var solidColorLayer = new CALayer
+			{
+				ContentsGravity = CALayer.GravityResizeAspectFill,
+				Frame = frame,
+				BackgroundColor = solidPaint.Color.ToCGColor()
+			};
+
+			return solidColorLayer;
+		}
+
+		public static CALayer? CreateCALayer(this GradientPaint gradientPaint, CGRect frame = default)
+		{
+			if (gradientPaint is LinearGradientPaint linearGradientPaint)
+				return linearGradientPaint.CreateCALayer(frame);
+
+			if (gradientPaint is RadialGradientPaint radialGradientPaint)
+				return radialGradientPaint.CreateCALayer(frame);
+
+			return null;
+		}
+
+		public static CALayer? CreateCALayer(this LinearGradientPaint linearGradientPaint, CGRect frame = default)
+		{
+			var p1 = linearGradientPaint.StartPoint;
+			var p2 = linearGradientPaint.EndPoint;
+
+			var linearGradientLayer = new CAGradientLayer
+			{
+				ContentsGravity = CALayer.GravityResizeAspectFill,
+				Frame = frame,
+				LayerType = CAGradientLayerType.Axial,
+				StartPoint = new CGPoint(p1.X, p1.Y),
+				EndPoint = new CGPoint(p2.X, p2.Y)
+			};
+
+			if (linearGradientPaint.GradientStops != null && linearGradientPaint.GradientStops.Length > 0)
+			{
+				var orderedStops = linearGradientPaint.GradientStops.OrderBy(x => x.Offset).ToList();
+				linearGradientLayer.Colors = orderedStops.Select(x => x.Color.ToCGColor()).ToArray();
+				linearGradientLayer.Locations = GetCAGradientLayerLocations(orderedStops);
+			}
+
+			return linearGradientLayer;
+		}
+
+		public static CALayer? CreateCALayer(this RadialGradientPaint radialGradientPaint, CGRect frame = default)
+		{
+			var center = radialGradientPaint.Center;
+			var radius = radialGradientPaint.Radius;
+
+			var radialGradientLayer = new CAGradientLayer
+			{
+				ContentsGravity = CALayer.GravityResizeAspectFill,
+				Frame = frame,
+				LayerType = CAGradientLayerType.Radial,
+				StartPoint = new CGPoint(center.X, center.Y),
+				EndPoint = GetRadialGradientPaintEndPoint(center, radius),
+				CornerRadius = (float)radius
+			};
+
+			if (radialGradientPaint.GradientStops != null && radialGradientPaint.GradientStops.Length > 0)
+			{
+				var orderedStops = radialGradientPaint.GradientStops.OrderBy(x => x.Offset).ToList();
+				radialGradientLayer.Colors = orderedStops.Select(x => x.Color.ToCGColor()).ToArray();
+				radialGradientLayer.Locations = GetCAGradientLayerLocations(orderedStops);
+			}
+
+			return radialGradientLayer;
+		}
+
+		public static CALayer? CreateCALayer(this ImagePaint imagePaint, CGRect frame = default)
+		{
+			throw new NotImplementedException();
+		}
+
+		public static CALayer? CreateCALayer(this PatternPaint patternPaint, CGRect frame = default)
+		{
+			throw new NotImplementedException();
+		}
+
+		static CGPoint GetRadialGradientPaintEndPoint(Point startPoint, double radius)
+		{
+			double x = startPoint.X == 1 ? (startPoint.X - radius) : (startPoint.X + radius);
+
+			if (x < 0)
+				x = 0;
+
+			if (x > 1)
+				x = 1;
+
+			double y = startPoint.Y == 1 ? (startPoint.Y - radius) : (startPoint.Y + radius);
+
+			if (y < 0)
+				y = 0;
+
+			if (y > 1)
+				y = 1;
+
+			return new CGPoint(x, y);
+		}
+
+		static NSNumber[] GetCAGradientLayerLocations(List<GradientStop> gradientStops)
+		{
+			if (gradientStops == null || gradientStops.Count == 0)
+				return new NSNumber[0];
+
+			if (gradientStops.Count > 1 && gradientStops.Any(gt => gt.Offset != 0))
+				return gradientStops.Select(x => new NSNumber(x.Offset)).ToArray();
+			else
+			{
+				int itemCount = gradientStops.Count;
+				int index = 0;
+				float step = 1.0f / itemCount;
+
+				NSNumber[] locations = new NSNumber[itemCount];
+
+				foreach (var gradientStop in gradientStops)
+				{
+					float location = step * index;
+					bool setLocation = !gradientStops.Any(gt => gt.Offset > location);
+
+					if (gradientStop.Offset == 0 && setLocation)
+						locations[index] = new NSNumber(location);
+					else
+						locations[index] = new NSNumber(gradientStop.Offset);
+
+					index++;
+				}
+
+				return locations;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Handlers/Button/ButtonHandler.Windows.cs b/src/Core/src/Handlers/Button/ButtonHandler.Windows.cs
index 860fe7817906..0ca9908f57b5 100644
--- a/src/Core/src/Handlers/Button/ButtonHandler.Windows.cs
+++ b/src/Core/src/Handlers/Button/ButtonHandler.Windows.cs
@@ -46,9 +46,9 @@ protected override void DisconnectHandler(Button nativeView)
 		}
 
 		// This is a Windows-specific mapping
-		public static void MapBackgroundColor(ButtonHandler handler, IButton button)
+		public static void MapBackground(ButtonHandler handler, IButton button)
 		{
-			handler.NativeView?.UpdateBackgroundColor(button, DefaultBackground);
+			handler.NativeView?.UpdateBackground(button, DefaultBackground);
 		}
 
 		public static void MapText(ButtonHandler handler, IButton button)
diff --git a/src/Core/src/Handlers/Button/ButtonHandler.cs b/src/Core/src/Handlers/Button/ButtonHandler.cs
index e0ea2a9a4b16..f6ebeb49f611 100644
--- a/src/Core/src/Handlers/Button/ButtonHandler.cs
+++ b/src/Core/src/Handlers/Button/ButtonHandler.cs
@@ -6,7 +6,7 @@ public partial class ButtonHandler
 		public static PropertyMapper<IButton, ButtonHandler> ButtonMapper = new PropertyMapper<IButton, ButtonHandler>(ViewHandler.ViewMapper)
 		{
 #if WINDOWS
-			[nameof(IButton.BackgroundColor)] = MapBackgroundColor,
+			[nameof(IButton.Background)] = MapBackground,
 #endif
 			[nameof(IButton.CharacterSpacing)] = MapCharacterSpacing,
 			[nameof(IButton.Font)] = MapFont,
diff --git a/src/Core/src/Handlers/CheckBox/CheckBoxHandler.Android.cs b/src/Core/src/Handlers/CheckBox/CheckBoxHandler.Android.cs
index 4673cb234a53..83fc70699d9f 100644
--- a/src/Core/src/Handlers/CheckBox/CheckBoxHandler.Android.cs
+++ b/src/Core/src/Handlers/CheckBox/CheckBoxHandler.Android.cs
@@ -32,9 +32,9 @@ protected override void DisconnectHandler(AppCompatCheckBox nativeView)
 		}
 
 		// This is an Android-specific mapping
-		public static void MapBackgroundColor(CheckBoxHandler handler, ICheckBox check)
+		public static void MapBackground(CheckBoxHandler handler, ICheckBox check)
 		{
-			handler.NativeView?.UpdateBackgroundColor(check);
+			handler.NativeView?.UpdateBackground(check);
 		}
 
 		public static void MapIsChecked(CheckBoxHandler handler, ICheckBox check)
diff --git a/src/Core/src/Handlers/CheckBox/CheckBoxHandler.cs b/src/Core/src/Handlers/CheckBox/CheckBoxHandler.cs
index e4f25fd1dab7..b6de4157da34 100644
--- a/src/Core/src/Handlers/CheckBox/CheckBoxHandler.cs
+++ b/src/Core/src/Handlers/CheckBox/CheckBoxHandler.cs
@@ -5,7 +5,7 @@ public partial class CheckBoxHandler
 		public static PropertyMapper<ICheckBox, CheckBoxHandler> CheckBoxMapper = new PropertyMapper<ICheckBox, CheckBoxHandler>(ViewHandler.ViewMapper)
 		{
 #if MONOANDROID
-			[nameof(ICheckBox.BackgroundColor)] = MapBackgroundColor,
+			[nameof(ICheckBox.Background)] = MapBackground,
 #endif
 			[nameof(ICheckBox.IsChecked)] = MapIsChecked,
 		};
diff --git a/src/Core/src/Handlers/DatePicker/DatePickerHandler.Windows.cs b/src/Core/src/Handlers/DatePicker/DatePickerHandler.Windows.cs
index a249127704c6..cb382688417c 100644
--- a/src/Core/src/Handlers/DatePicker/DatePickerHandler.Windows.cs
+++ b/src/Core/src/Handlers/DatePicker/DatePickerHandler.Windows.cs
@@ -10,8 +10,10 @@ public partial class DatePickerHandler : ViewHandler<IDatePicker, DatePicker>
 		[MissingMapper]
 		public static void MapFormat(DatePickerHandler handler, IDatePicker datePicker) { }
 
-		[MissingMapper]
-		public static void MapDate(DatePickerHandler handler, IDatePicker datePicker) { }
+		public static void MapDate(DatePickerHandler handler, IDatePicker datePicker)
+		{
+			handler.NativeView?.UpdateDate(datePicker);
+		}
 
 		[MissingMapper]
 		public static void MapMinimumDate(DatePickerHandler handler, IDatePicker datePicker) { }
diff --git a/src/Core/src/Handlers/Editor/EditorHandler.Android.cs b/src/Core/src/Handlers/Editor/EditorHandler.Android.cs
index f23c64d1df79..5b4629713a41 100644
--- a/src/Core/src/Handlers/Editor/EditorHandler.Android.cs
+++ b/src/Core/src/Handlers/Editor/EditorHandler.Android.cs
@@ -1,9 +1,8 @@
-using System;
-using Android.Content.Res;
+using Android.Content.Res;
 using Android.Views;
 using Android.Views.InputMethods;
 using AndroidX.AppCompat.Widget;
-using Microsoft.Extensions.DependencyInjection;
+using static Android.Views.View;
 
 namespace Microsoft.Maui.Handlers
 {
@@ -12,6 +11,8 @@ public partial class EditorHandler : ViewHandler<IEditor, AppCompatEditText>
 		static ColorStateList? DefaultTextColors { get; set; }
 		static ColorStateList? DefaultPlaceholderTextColors { get; set; }
 
+		EditorFocusChangeListener FocusChangeListener { get; } = new EditorFocusChangeListener();
+
 		protected override AppCompatEditText CreateNativeView()
 		{
 			var editText = new AppCompatEditText(Context)
@@ -27,6 +28,20 @@ protected override AppCompatEditText CreateNativeView()
 			return editText;
 		}
 
+		protected override void ConnectHandler(AppCompatEditText nativeView)
+		{
+			FocusChangeListener.Handler = this;
+
+			nativeView.OnFocusChangeListener = FocusChangeListener;
+		}
+
+		protected override void DisconnectHandler(AppCompatEditText nativeView)
+		{
+			nativeView.OnFocusChangeListener = null;
+
+			FocusChangeListener.Handler = null;
+		}
+
 		protected override void SetupDefaults(AppCompatEditText nativeView)
 		{
 			base.SetupDefaults(nativeView);
@@ -85,6 +100,22 @@ public static void MapFont(EditorHandler handler, IEditor editor)
 		public static void MapHorizontalTextAlignment(EditorHandler handler, IEditor editor)
 		{
 			handler.NativeView?.UpdateHorizontalTextAlignment(editor);	
+    }
+
+		void OnFocusedChange(bool hasFocus)
+		{
+			if (!hasFocus)
+				VirtualView?.Completed();
+		}
+
+		class EditorFocusChangeListener : Java.Lang.Object, IOnFocusChangeListener
+		{
+			public EditorHandler? Handler { get; set; }
+
+			public void OnFocusChange(View? v, bool hasFocus)
+			{
+				Handler?.OnFocusedChange(hasFocus);
+			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Handlers/Editor/EditorHandler.Windows.cs b/src/Core/src/Handlers/Editor/EditorHandler.Windows.cs
index 61a4eb25aebd..e19b2761a591 100644
--- a/src/Core/src/Handlers/Editor/EditorHandler.Windows.cs
+++ b/src/Core/src/Handlers/Editor/EditorHandler.Windows.cs
@@ -1,18 +1,36 @@
-using System;
-using Microsoft.UI.Xaml.Controls;
-using WBrush = Microsoft.UI.Xaml.Media.Brush;
+#nullable enable
+using Microsoft.UI.Xaml;
 
 namespace Microsoft.Maui.Handlers
 {
 	public partial class EditorHandler : ViewHandler<IEditor, MauiTextBox>
 	{
-		protected override MauiTextBox CreateNativeView() => new MauiTextBox();
+		protected override MauiTextBox CreateNativeView() => new MauiTextBox
+		{
+			AcceptsReturn = true,
+			TextWrapping = TextWrapping.Wrap,
+			VerticalContentAlignment = VerticalAlignment.Top
+		};
 
-		[MissingMapper]
-		public static void MapText(IViewHandler handler, IEditor editor) { }
+		protected override void ConnectHandler(MauiTextBox nativeView)
+		{
+			nativeView.LostFocus += OnLostFocus;
+		}
 
-		[MissingMapper]
-		public static void MapPlaceholder(IViewHandler handler, IEditor editor) { }
+		protected override void DisconnectHandler(MauiTextBox nativeView)
+		{
+			nativeView.LostFocus -= OnLostFocus;
+		}
+
+		public static void MapText(EditorHandler handler, IEditor editor)
+		{
+			handler.NativeView?.UpdateText(editor);
+		}
+
+		public static void MapPlaceholder(EditorHandler handler, IEditor editor)
+		{
+			handler.NativeView?.UpdatePlaceholder(editor);
+		}
 
 		[MissingMapper]
 		public static void MapPlaceholderColor(IViewHandler handler, IEditor editor) { }
@@ -20,19 +38,32 @@ public static void MapPlaceholderColor(IViewHandler handler, IEditor editor) { }
 		[MissingMapper]
 		public static void MapCharacterSpacing(IViewHandler handler, IEditor editor) { }
 
-		[MissingMapper]
-		public static void MapMaxLength(IViewHandler handler, IEditor editor) { }
+		public static void MapMaxLength(EditorHandler handler, IEditor editor)
+		{
+			handler.NativeView?.UpdateMaxLength(editor);
+		}
 
 		[MissingMapper]
 		public static void MapIsTextPredictionEnabled(EditorHandler handler, IEditor editor) { }
 
-		[MissingMapper]
-		public static void MapFont(IViewHandler handler, IEditor editor) { }
+		public static void MapFont(EditorHandler handler, IEditor editor)
+		{
+			var fontManager = handler.GetRequiredService<IFontManager>();
 
-		[MissingMapper]
-		public static void MapIsReadOnly(IViewHandler handler, IEditor editor) { }
+			handler.NativeView?.UpdateFont(editor, fontManager);
+		}
+
+		public static void MapIsReadOnly(EditorHandler handler, IEditor editor)
+		{
+			handler.NativeView?.UpdateIsReadOnly(editor);
+		}
 
 		public static void MapTextColor(EditorHandler handler, IEditor editor) =>
 			handler.NativeView?.UpdateTextColor(editor);
+		
+		void OnLostFocus(object? sender, RoutedEventArgs e)
+		{
+			VirtualView?.Completed();
+		}
 	}
 }
diff --git a/src/Core/src/Handlers/Editor/EditorHandler.iOS.cs b/src/Core/src/Handlers/Editor/EditorHandler.iOS.cs
index 82af233adce0..36a0371357e8 100644
--- a/src/Core/src/Handlers/Editor/EditorHandler.iOS.cs
+++ b/src/Core/src/Handlers/Editor/EditorHandler.iOS.cs
@@ -1,7 +1,6 @@
 using System;
 using CoreGraphics;
 using Foundation;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Maui.Graphics;
 using Microsoft.Maui.Platform.iOS;
 using UIKit;
@@ -23,12 +22,14 @@ protected override void ConnectHandler(MauiTextView nativeView)
 		{
 			nativeView.Changed += OnChanged;
 			nativeView.ShouldChangeText += OnShouldChangeText;
+			nativeView.Ended += OnEnded;
 		}
 
 		protected override void DisconnectHandler(MauiTextView nativeView)
 		{
 			nativeView.Changed -= OnChanged;
 			nativeView.ShouldChangeText -= OnShouldChangeText;
+			nativeView.Ended -= OnEnded;
 		}
 
 		public override Size GetDesiredSize(double widthConstraint, double heightConstraint) =>
@@ -85,6 +86,13 @@ public static void MapFormatting(EditorHandler handler, IEditor editor)
 			handler.NativeView?.UpdateCharacterSpacing(editor);
 		}
 
+		public static void MapFont(EditorHandler handler, IEditor editor)
+		{
+			var fontManager = handler.GetRequiredService<IFontManager>();
+
+			handler.NativeView?.UpdateFont(editor, fontManager);
+		}
+
 		void OnChanged(object? sender, System.EventArgs e) => OnTextChanged();
 
 		void OnTextChanged()
@@ -99,7 +107,7 @@ bool OnShouldChangeText(UITextView textView, NSRange range, string replacementSt
 		{
 			var currLength = textView?.Text?.Length ?? 0;
 
-			// fix a crash on undo
+			// Fix a crash on undo
 			if (range.Length + range.Location > currLength)
 				return false;
 
@@ -114,11 +122,16 @@ bool OnShouldChangeText(UITextView textView, NSRange range, string replacementSt
 			return newLength <= VirtualView.MaxLength;
 		}
 
-		public static void MapFont(EditorHandler handler, IEditor editor)
+		void OnEnded(object? sender, EventArgs eventArgs)
 		{
-			var fontManager = handler.GetRequiredService<IFontManager>();
+			if (VirtualView == null || NativeView == null)
+				return;
 
-			handler.NativeView?.UpdateFont(editor, fontManager);
+			if (NativeView.Text != VirtualView.Text)
+				VirtualView.Text = NativeView.Text ?? string.Empty;
+
+			// TODO: Update IsFocused property
+			VirtualView.Completed();
 		}
 
 		public static void MapHorizontalTextAlignment(EditorHandler handler, IEditor editor)
diff --git a/src/Core/src/Handlers/Entry/EntryHandler.Android.cs b/src/Core/src/Handlers/Entry/EntryHandler.Android.cs
index e995dc25f21f..b76a1fe1aa58 100644
--- a/src/Core/src/Handlers/Entry/EntryHandler.Android.cs
+++ b/src/Core/src/Handlers/Entry/EntryHandler.Android.cs
@@ -1,12 +1,14 @@
-using System;
-using Android.Content.Res;
+using Android.Content.Res;
 using Android.Graphics.Drawables;
+using Android.Runtime;
 using Android.Text;
 using Android.Views;
+using Android.Views.InputMethods;
+using Android.Widget;
 using AndroidX.AppCompat.Widget;
 using AndroidX.Core.Content;
-using Microsoft.Extensions.DependencyInjection;
 using static Android.Views.View;
+using static Android.Widget.TextView;
 
 namespace Microsoft.Maui.Handlers
 {
@@ -15,6 +17,7 @@ public partial class EntryHandler : ViewHandler<IEntry, AppCompatEditText>
 		TextWatcher Watcher { get; } = new TextWatcher();
 		EntryTouchListener TouchListener { get; } = new EntryTouchListener();
 		EntryFocusChangeListener FocusChangeListener { get; } = new EntryFocusChangeListener();
+		EditorActionListener ActionListener { get; } = new EditorActionListener();
 
 		static ColorStateList? DefaultTextColors { get; set; }
 		static Drawable? ClearButtonDrawable { get; set; }
@@ -33,10 +36,12 @@ protected override void ConnectHandler(AppCompatEditText nativeView)
 			Watcher.Handler = this;
 			TouchListener.Handler = this;
 			FocusChangeListener.Handler = this;
+			ActionListener.Handler = this;
 
 			nativeView.OnFocusChangeListener = FocusChangeListener;
 			nativeView.AddTextChangedListener(Watcher);
 			nativeView.SetOnTouchListener(TouchListener);
+			nativeView.SetOnEditorActionListener(ActionListener);
 		}
 
 		protected override void DisconnectHandler(AppCompatEditText nativeView)
@@ -44,10 +49,12 @@ protected override void DisconnectHandler(AppCompatEditText nativeView)
 			nativeView.RemoveTextChangedListener(Watcher);
 			nativeView.SetOnTouchListener(null);
 			nativeView.OnFocusChangeListener = null;
+			nativeView.SetOnEditorActionListener(null);
 
 			FocusChangeListener.Handler = null;
 			Watcher.Handler = null;
 			TouchListener.Handler = null;
+			ActionListener.Handler = null;
 		}
 
 		protected override void SetupDefaults(AppCompatEditText nativeView)
@@ -212,7 +219,7 @@ void ITextWatcher.BeforeTextChanged(Java.Lang.ICharSequence? s, int start, int c
 
 			void ITextWatcher.OnTextChanged(Java.Lang.ICharSequence? s, int start, int before, int count)
 			{
-				// we are replacing 0 characters with 0 characters, so skip
+				// We are replacing 0 characters with 0 characters, so skip
 				if (before == 0 && count == 0)
 					return;
 
@@ -240,5 +247,22 @@ public void OnFocusChange(View? v, bool hasFocus)
 				Handler?.OnFocusedChange(hasFocus);
 			}
 		}
+
+		class EditorActionListener : Java.Lang.Object, IOnEditorActionListener
+		{
+			public EntryHandler? Handler { get; set; }
+
+			public bool OnEditorAction(TextView? v, [GeneratedEnum] ImeAction actionId, KeyEvent? e)
+			{
+				if (actionId == ImeAction.Done || (actionId == ImeAction.ImeNull && e?.KeyCode == Keycode.Enter && e?.Action == KeyEventActions.Up))
+				{
+					// TODO: Dismiss keyboard for hardware / physical keyboards
+
+					Handler?.VirtualView?.Completed();
+				}
+
+				return true;
+			}
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Handlers/Entry/EntryHandler.Windows.cs b/src/Core/src/Handlers/Entry/EntryHandler.Windows.cs
index 6fa36d609a9f..b93ee4b097be 100644
--- a/src/Core/src/Handlers/Entry/EntryHandler.Windows.cs
+++ b/src/Core/src/Handlers/Entry/EntryHandler.Windows.cs
@@ -1,11 +1,23 @@
-using System;
-using Microsoft.UI.Xaml.Controls;
+#nullable enable
+using Microsoft.UI.Xaml.Input;
+using Windows.System;
 
-namespace Microsoft.Maui.Handlers
+namespace Microsoft.Maui.Handlers
 {
 	public partial class EntryHandler : ViewHandler<IEntry, MauiTextBox>
 	{
-		protected override MauiTextBox CreateNativeView() =>  new MauiTextBox { Style = Microsoft.UI.Xaml.Application.Current.Resources["MauiTextBoxStyle"] as Microsoft.UI.Xaml.Style };
+		protected override MauiTextBox CreateNativeView() =>
+			new MauiTextBox { Style = UI.Xaml.Application.Current.Resources["MauiTextBoxStyle"] as UI.Xaml.Style };
+
+		protected override void ConnectHandler(MauiTextBox nativeView)
+		{
+			nativeView.KeyUp += OnNativeKeyUp;
+		}
+
+		protected override void DisconnectHandler(MauiTextBox nativeView)
+		{
+			nativeView.KeyUp -= OnNativeKeyUp;
+		}
 
 		public static void MapText(EntryHandler handler, IEntry entry) 
 		{
@@ -24,14 +36,20 @@ public static void MapHorizontalTextAlignment(IViewHandler handler, IEntry entry
 		[MissingMapper]
 		public static void MapIsTextPredictionEnabled(IViewHandler handler, IEntry entry) { }
 
-		[MissingMapper]
-		public static void MapMaxLength(IViewHandler handler, IEntry entry) { }
+		public static void MapMaxLength(EntryHandler handler, IEntry entry)
+		{
+			handler.NativeView?.UpdateMaxLength(entry);
+		}
 
-		[MissingMapper]
-		public static void MapPlaceholder(IViewHandler handler, IEntry entry) { }
+		public static void MapPlaceholder(EntryHandler handler, IEntry entry)
+		{
+			handler.NativeView?.UpdatePlaceholder(entry);
+		}
 
-		[MissingMapper]
-		public static void MapIsReadOnly(IViewHandler handler, IEntry entry) { }
+		public static void MapIsReadOnly(EntryHandler handler, IEntry entry)
+		{
+			handler.NativeView?.UpdateIsReadOnly(entry);
+		}
 
 		[MissingMapper]
 		public static void MapFont(IViewHandler handler, IEntry entry) { }
@@ -47,5 +65,22 @@ public static void MapCharacterSpacing(IViewHandler handler, IEntry entry) { }
 
 		[MissingMapper]
 		public static void MapKeyboard(IViewHandler handler, IEntry entry) { }
+
+		void OnNativeKeyUp(object? sender, KeyRoutedEventArgs args)
+		{
+			if (args?.Key != VirtualKey.Enter)
+				return;
+
+			if (VirtualView?.ReturnType == ReturnType.Next)
+			{
+				FocusManager.TryMoveFocus(FocusNavigationDirection.Next);
+			}
+			else
+			{
+				// TODO: Hide the soft keyboard; this matches the behavior of .NET MAUI on Android/iOS
+			}
+
+			VirtualView?.Completed();
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Handlers/Entry/EntryHandler.iOS.cs b/src/Core/src/Handlers/Entry/EntryHandler.iOS.cs
index 9de49680353f..560074be5458 100644
--- a/src/Core/src/Handlers/Entry/EntryHandler.iOS.cs
+++ b/src/Core/src/Handlers/Entry/EntryHandler.iOS.cs
@@ -1,6 +1,5 @@
 using System;
 using Foundation;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Maui.Graphics;
 using Microsoft.Maui.Platform.iOS;
 using UIKit;
@@ -9,8 +8,6 @@ namespace Microsoft.Maui.Handlers
 {
 	public partial class EntryHandler : ViewHandler<IEntry, MauiTextField>
 	{
-		static readonly int BaseHeight = 30;
-
 		static UIColor? DefaultTextColor;
 
 		protected override MauiTextField CreateNativeView()
@@ -24,6 +21,7 @@ protected override MauiTextField CreateNativeView()
 
 		protected override void ConnectHandler(MauiTextField nativeView)
 		{
+			nativeView.ShouldReturn = OnShouldReturn;
 			nativeView.EditingChanged += OnEditingChanged;
 			nativeView.EditingDidEnd += OnEditingEnded;
 			nativeView.TextPropertySet += OnTextPropertySet;
@@ -43,9 +41,6 @@ protected override void SetupDefaults(MauiTextField nativeView)
 			DefaultTextColor = nativeView.TextColor;
 		}
 
-		public override Size GetDesiredSize(double widthConstraint, double heightConstraint) =>
-			new SizeRequest(new Size(widthConstraint, BaseHeight));
-
 		public static void MapText(EntryHandler handler, IEntry entry)
 		{
 			handler.NativeView?.UpdateText(entry);
@@ -128,6 +123,17 @@ public static void MapClearButtonVisibility(EntryHandler handler, IEntry entry)
 			handler.NativeView?.UpdateClearButtonVisibility(entry);
 		}
 
+		protected virtual bool OnShouldReturn(UITextField view)
+		{
+			view.ResignFirstResponder();
+
+			// TODO: Focus next View
+
+			VirtualView?.Completed();
+
+			return false;
+		}
+
 		void OnEditingChanged(object? sender, EventArgs e) => OnTextChanged();
 
 		void OnEditingEnded(object? sender, EventArgs e) => OnTextChanged();
diff --git a/src/Core/src/Handlers/IViewHandler.Mac.cs b/src/Core/src/Handlers/IViewHandler.Mac.cs
deleted file mode 100644
index 873e2bd3f0a2..000000000000
--- a/src/Core/src/Handlers/IViewHandler.Mac.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using AppKit;
-
-namespace Microsoft.Maui
-{
-	public interface INativeViewHandler : IViewHandler
-	{
-		NSView? View { get; }
-	}
-}
\ No newline at end of file
diff --git a/src/Core/src/Handlers/IViewHandler.cs b/src/Core/src/Handlers/IViewHandler.cs
index 043252d8c3a7..7f2039266286 100644
--- a/src/Core/src/Handlers/IViewHandler.cs
+++ b/src/Core/src/Handlers/IViewHandler.cs
@@ -10,8 +10,9 @@ public interface IViewHandler
 		void DisconnectHandler();
 		object? NativeView { get; }
 		IView? VirtualView { get; }
+		IMauiContext? MauiContext { get; }
 		bool HasContainer { get; set; }
 		Size GetDesiredSize(double widthConstraint, double heightConstraint);
-		void SetFrame(Rectangle frame);
+		void NativeArrange(Rectangle frame);
 	}
 }
diff --git a/src/Core/src/Handlers/IViewHandler.iOS.cs b/src/Core/src/Handlers/IViewHandler.iOS.cs
index c24aefd133c1..cbfba9aac652 100644
--- a/src/Core/src/Handlers/IViewHandler.iOS.cs
+++ b/src/Core/src/Handlers/IViewHandler.iOS.cs
@@ -5,5 +5,6 @@ namespace Microsoft.Maui
 	public interface INativeViewHandler : IViewHandler
 	{
 		new UIView? NativeView { get; }
+		UIViewController? ViewController { get; }
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Handlers/Image/ImageHandler.Android.cs b/src/Core/src/Handlers/Image/ImageHandler.Android.cs
new file mode 100644
index 000000000000..a6b334aa900d
--- /dev/null
+++ b/src/Core/src/Handlers/Image/ImageHandler.Android.cs
@@ -0,0 +1,41 @@
+#nullable enable
+using System.Threading.Tasks;
+using Android.Widget;
+using AndroidX.AppCompat.Widget;
+
+namespace Microsoft.Maui.Handlers
+{
+	public partial class ImageHandler : ViewHandler<IImage, ImageView>
+	{
+		protected override ImageView CreateNativeView() => new AppCompatImageView(Context);
+
+		protected override void DisconnectHandler(ImageView nativeView)
+		{
+			base.DisconnectHandler(nativeView);
+
+			_sourceManager.Reset();
+		}
+
+		public static void MapAspect(ImageHandler handler, IImage image) =>
+			handler.NativeView?.UpdateAspect(image);
+
+		public static void MapIsAnimationPlaying(ImageHandler handler, IImage image) =>
+			handler.NativeView?.UpdateIsAnimationPlaying(image);
+
+		public static void MapSource(ImageHandler handler, IImage image) =>
+			MapSourceAsync(handler, image).FireAndForget(handler);
+
+		public static async Task MapSourceAsync(ImageHandler handler, IImage image)
+		{
+			if (handler.NativeView == null)
+				return;
+
+			var token = handler._sourceManager.BeginLoad();
+
+			var provider = handler.GetRequiredService<IImageSourceServiceProvider>();
+			var result = await handler.NativeView.UpdateSourceAsync(image, provider, token);
+
+			handler._sourceManager.CompleteLoad(result);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Handlers/Image/ImageHandler.Standard.cs b/src/Core/src/Handlers/Image/ImageHandler.Standard.cs
new file mode 100644
index 000000000000..61d6cfb9cf39
--- /dev/null
+++ b/src/Core/src/Handlers/Image/ImageHandler.Standard.cs
@@ -0,0 +1,14 @@
+#nullable enable
+using System;
+
+namespace Microsoft.Maui.Handlers
+{
+	public partial class ImageHandler : ViewHandler<IImage, object>
+	{
+		protected override object CreateNativeView() => throw new NotImplementedException();
+
+		public static void MapAspect(ImageHandler handler, IImage image) { }
+		public static void MapIsAnimationPlaying(ImageHandler handler, IImage image) { }
+		public static void MapSource(ImageHandler handler, IImage image) { }
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Handlers/Image/ImageHandler.Windows.cs b/src/Core/src/Handlers/Image/ImageHandler.Windows.cs
new file mode 100644
index 000000000000..f1511a7144f6
--- /dev/null
+++ b/src/Core/src/Handlers/Image/ImageHandler.Windows.cs
@@ -0,0 +1,91 @@
+#nullable enable
+using System.Threading.Tasks;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+
+namespace Microsoft.Maui.Handlers
+{
+	public partial class ImageHandler : ViewHandler<IImage, FrameworkElement>
+	{
+		double _lastScale = 0.0;
+
+		protected Image? RealNativeView { get; set; }
+
+		protected override FrameworkElement CreateNativeView()
+		{
+			RealNativeView = new Image();
+			return new Border { Child = RealNativeView };
+		}
+
+		protected override void ConnectHandler(FrameworkElement nativeView)
+		{
+			base.ConnectHandler(nativeView);
+
+			_lastScale = 0.0;
+			nativeView.Loaded += OnNativeViewLoaded;
+			nativeView.Unloaded += OnNativeViewUnloaded;
+		}
+
+		protected override void DisconnectHandler(FrameworkElement nativeView)
+		{
+			base.DisconnectHandler(nativeView);
+
+			if (nativeView.XamlRoot != null)
+				nativeView.XamlRoot.Changed -= OnXamlRootChanged;
+
+			_lastScale = 0.0;
+			nativeView.Loaded -= OnNativeViewLoaded;
+			nativeView.Unloaded -= OnNativeViewUnloaded;
+
+			_sourceManager.Reset();
+		}
+
+		public static void MapAspect(ImageHandler handler, IImage image) =>
+			handler.RealNativeView?.UpdateAspect(image);
+
+		public static void MapIsAnimationPlaying(ImageHandler handler, IImage image) =>
+			handler.RealNativeView?.UpdateIsAnimationPlaying(image);
+
+		public static void MapSource(ImageHandler handler, IImage image) =>
+			MapSourceAsync(handler, image).FireAndForget(handler);
+
+		public static async Task MapSourceAsync(ImageHandler handler, IImage image)
+		{
+			if (handler.RealNativeView == null)
+				return;
+
+			var token = handler._sourceManager.BeginLoad();
+
+			var provider = handler.GetRequiredService<IImageSourceServiceProvider>();
+			var result = await handler.RealNativeView.UpdateSourceAsync(image, provider, token);
+
+			handler._sourceManager.CompleteLoad(result);
+		}
+
+		void OnNativeViewLoaded(object sender = null!, RoutedEventArgs e = null!)
+		{
+			if (NativeView?.XamlRoot != null)
+			{
+				_lastScale = NativeView.XamlRoot.RasterizationScale;
+				NativeView.XamlRoot.Changed += OnXamlRootChanged;
+			}
+		}
+
+		void OnNativeViewUnloaded(object sender = null!, RoutedEventArgs e = null!)
+		{
+			if (NativeView?.XamlRoot != null)
+				NativeView.XamlRoot.Changed -= OnXamlRootChanged;
+		}
+
+		void OnXamlRootChanged(XamlRoot sender, XamlRootChangedEventArgs args)
+		{
+			if (_lastScale == sender.RasterizationScale)
+				return;
+
+			_lastScale = sender.RasterizationScale;
+
+			if (_sourceManager.IsResolutionDependent)
+				UpdateValue(nameof(IImage.Source));
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Handlers/Image/ImageHandler.cs b/src/Core/src/Handlers/Image/ImageHandler.cs
new file mode 100644
index 000000000000..748271557b5c
--- /dev/null
+++ b/src/Core/src/Handlers/Image/ImageHandler.cs
@@ -0,0 +1,27 @@
+#nullable enable
+using System;
+using System.Threading;
+
+namespace Microsoft.Maui.Handlers
+{
+	public partial class ImageHandler
+	{
+		readonly ImageSourceServiceResultManager _sourceManager = new ImageSourceServiceResultManager();
+
+		public static PropertyMapper<IImage, ImageHandler> ImageMapper = new PropertyMapper<IImage, ImageHandler>(ViewHandler.ViewMapper)
+		{
+			// TODO: Map Background and use the ContainerView (when available)
+			[nameof(IImage.Aspect)] = MapAspect,
+			[nameof(IImage.IsAnimationPlaying)] = MapIsAnimationPlaying,
+			[nameof(IImage.Source)] = MapSource,
+		};
+
+		public ImageHandler() : base(ImageMapper)
+		{
+		}
+
+		public ImageHandler(PropertyMapper mapper) : base(mapper ?? ImageMapper)
+		{
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Handlers/Image/ImageHandler.iOS.cs b/src/Core/src/Handlers/Image/ImageHandler.iOS.cs
new file mode 100644
index 000000000000..dba18dd8a5e3
--- /dev/null
+++ b/src/Core/src/Handlers/Image/ImageHandler.iOS.cs
@@ -0,0 +1,59 @@
+#nullable enable
+using System;
+using System.Threading.Tasks;
+using Microsoft.Maui.Platform.iOS;
+using UIKit;
+
+namespace Microsoft.Maui.Handlers
+{
+	public partial class ImageHandler : ViewHandler<IImage, UIImageView>
+	{
+		protected override UIImageView CreateNativeView() => new MauiImageView();
+
+		protected override void ConnectHandler(UIImageView nativeView)
+		{
+			base.ConnectHandler(nativeView);
+
+			if (NativeView is MauiImageView imageView)
+				imageView.WindowChanged += OnWindowChanged;
+		}
+
+		protected override void DisconnectHandler(UIImageView nativeView)
+		{
+			base.DisconnectHandler(nativeView);
+
+			if (NativeView is MauiImageView imageView)
+				imageView.WindowChanged -= OnWindowChanged;
+
+			_sourceManager.Reset();
+		}
+
+		public static void MapAspect(ImageHandler handler, IImage image) =>
+			handler.NativeView?.UpdateAspect(image);
+
+		public static void MapIsAnimationPlaying(ImageHandler handler, IImage image) =>
+			handler.NativeView?.UpdateIsAnimationPlaying(image);
+
+		public static void MapSource(ImageHandler handler, IImage image) =>
+			MapSourceAsync(handler, image).FireAndForget(handler);
+
+		public static async Task MapSourceAsync(ImageHandler handler, IImage image)
+		{
+			if (handler.NativeView == null)
+				return;
+
+			var token = handler._sourceManager.BeginLoad();
+
+			var provider = handler.GetRequiredService<IImageSourceServiceProvider>();
+			var result = await handler.NativeView.UpdateSourceAsync(image, provider, token);
+
+			handler._sourceManager.CompleteLoad(result);
+		}
+
+		void OnWindowChanged(object? sender, EventArgs e)
+		{
+			if (_sourceManager.IsResolutionDependent)
+				UpdateValue(nameof(IImage.Source));
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Handlers/Label/LabelHandler.Windows.cs b/src/Core/src/Handlers/Label/LabelHandler.Windows.cs
index 6eec7163cee6..ff8a183089d3 100644
--- a/src/Core/src/Handlers/Label/LabelHandler.Windows.cs
+++ b/src/Core/src/Handlers/Label/LabelHandler.Windows.cs
@@ -8,28 +8,28 @@ namespace Microsoft.Maui.Handlers
 {
 	public partial class LabelHandler : ViewHandler<ILabel, FrameworkElement>
 	{
-		protected TextBlock? TextBlock { get; set; }
+		protected TextBlock? RealNativeView { get; set; }
 
 		protected override FrameworkElement CreateNativeView()
 		{
-			TextBlock = new TextBlock();
-			return new Border { Child = TextBlock };
+			RealNativeView = new TextBlock();
+			return new Border { Child = RealNativeView };
 		}
 
 		public static void MapText(LabelHandler handler, ILabel label) =>
-			handler.TextBlock?.UpdateText(label);
+			handler.RealNativeView?.UpdateText(label);
 
 		public static void MapTextColor(LabelHandler handler, ILabel label) =>
-			handler.TextBlock?.UpdateTextColor(label);
+			handler.RealNativeView?.UpdateTextColor(label);
 
 		public static void MapCharacterSpacing(LabelHandler handler, ILabel label) =>	
-			handler.TextBlock?.UpdateCharacterSpacing(label);
+			handler.RealNativeView?.UpdateCharacterSpacing(label);
 
 		public static void MapFont(LabelHandler handler, ILabel label)
 		{
 			var fontManager = handler.GetRequiredService<IFontManager>();
 
-			handler.TextBlock?.UpdateFont(label, fontManager);
+			handler.RealNativeView?.UpdateFont(label, fontManager);
 		}
 
 		[MissingMapper]
@@ -39,13 +39,13 @@ public static void MapHorizontalTextAlignment(LabelHandler handler, ILabel label
 		public static void MapLineBreakMode(LabelHandler handler, ILabel label) { }
 
 		public static void MapTextDecorations(LabelHandler handler, ILabel label) =>	
-			handler.TextBlock?.UpdateTextDecorations(label);
+			handler.RealNativeView?.UpdateTextDecorations(label);
 
 		public static void MapMaxLines(LabelHandler handler, ILabel label) =>
-			handler.TextBlock?.UpdateMaxLines(label);
+			handler.RealNativeView?.UpdateMaxLines(label);
 
 		public static void MapPadding(LabelHandler handler, ILabel label) =>
-			handler.TextBlock?.UpdatePadding(label);
+			handler.RealNativeView?.UpdatePadding(label);
 
 		[MissingMapper]
 		public static void MapLineHeight(LabelHandler handler, ILabel label) { }
diff --git a/src/Core/src/Handlers/Label/LabelHandler.cs b/src/Core/src/Handlers/Label/LabelHandler.cs
index aacefac4b651..ed3f84c205f6 100644
--- a/src/Core/src/Handlers/Label/LabelHandler.cs
+++ b/src/Core/src/Handlers/Label/LabelHandler.cs
@@ -5,6 +5,9 @@ public partial class LabelHandler
 	{
 		public static PropertyMapper<ILabel, LabelHandler> LabelMapper = new PropertyMapper<ILabel, LabelHandler>(ViewHandler.ViewMapper)
 		{
+#if __IOS__
+			[nameof(ILabel.Background)] = MapBackground,
+#endif
 			[nameof(ILabel.CharacterSpacing)] = MapCharacterSpacing,
 			[nameof(ILabel.Font)] = MapFont,
 			[nameof(ILabel.HorizontalTextAlignment)] = MapHorizontalTextAlignment,
diff --git a/src/Core/src/Handlers/Label/LabelHandler.iOS.cs b/src/Core/src/Handlers/Label/LabelHandler.iOS.cs
index c8e20597462f..de315932d910 100644
--- a/src/Core/src/Handlers/Label/LabelHandler.iOS.cs
+++ b/src/Core/src/Handlers/Label/LabelHandler.iOS.cs
@@ -1,5 +1,3 @@
-using System;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Maui.Platform.iOS;
 
 namespace Microsoft.Maui.Handlers
@@ -8,6 +6,11 @@ public partial class LabelHandler : ViewHandler<ILabel, MauiLabel>
 	{
 		protected override MauiLabel CreateNativeView() => new MauiLabel();
 
+		public static void MapBackground(LabelHandler handler, ILabel label)
+		{
+			handler.NativeView?.UpdateBackground(label);
+		}
+
 		public static void MapText(LabelHandler handler, ILabel label)
 		{
 			handler.NativeView?.UpdateText(label);
diff --git a/src/Core/src/Handlers/Layout/LayoutHandler.iOS.cs b/src/Core/src/Handlers/Layout/LayoutHandler.iOS.cs
index a0252178ff9d..882b7f1d8acf 100644
--- a/src/Core/src/Handlers/Layout/LayoutHandler.iOS.cs
+++ b/src/Core/src/Handlers/Layout/LayoutHandler.iOS.cs
@@ -1,11 +1,6 @@
 using System;
 using System.Linq;
-
-#if __IOS__ || IOS || MACCATALYST
 using NativeView = UIKit.UIView;
-#else
-using NativeView = AppKit.NSView;
-#endif
 
 namespace Microsoft.Maui.Handlers
 {
@@ -35,6 +30,7 @@ public override void SetVirtualView(IView view)
 			_ = VirtualView ?? throw new InvalidOperationException($"{nameof(VirtualView)} should have been set by base class.");
 			_ = MauiContext ?? throw new InvalidOperationException($"{nameof(MauiContext)} should have been set by base class.");
 
+			NativeView.View = view;
 			NativeView.CrossPlatformMeasure = VirtualView.Measure;
 			NativeView.CrossPlatformArrange = VirtualView.Arrange;
 
diff --git a/src/Core/src/Handlers/Page/PageHandler.Android.cs b/src/Core/src/Handlers/Page/PageHandler.Android.cs
index 5ae29e2d1b88..81cc5ddd1268 100644
--- a/src/Core/src/Handlers/Page/PageHandler.Android.cs
+++ b/src/Core/src/Handlers/Page/PageHandler.Android.cs
@@ -32,8 +32,13 @@ public override void SetVirtualView(IView view)
 			NativeView.CrossPlatformMeasure = VirtualView.Measure;
 			NativeView.CrossPlatformArrange = VirtualView.Arrange;
 			NativeView.RemoveAllViews();
-			//var wrap = ViewGroup.LayoutParams.WrapContent;
-			NativeView.AddView(VirtualView.Content.ToNative(MauiContext)); // , new ViewGroup.LayoutParams(wrap, wrap));
+
+			if (VirtualView.Content != null)
+				NativeView.AddView(VirtualView.Content.ToNative(MauiContext));
+		}
+
+		public static void MapTitle(PageHandler handler, IPage page)
+		{
 		}
 	}
 }
diff --git a/src/Core/src/Handlers/Page/PageHandler.Mac.cs b/src/Core/src/Handlers/Page/PageHandler.Mac.cs
index 86ca9de6d9d5..65c3ca94d546 100644
--- a/src/Core/src/Handlers/Page/PageHandler.Mac.cs
+++ b/src/Core/src/Handlers/Page/PageHandler.Mac.cs
@@ -10,5 +10,9 @@ protected override NSView CreateView()
 		{
 			return new NSView();
 		}
+
+		public static void MapTitle(PageHandler handler, IPage page)
+		{
+		}
 	}
 }
diff --git a/src/Core/src/Handlers/Page/PageHandler.Standard.cs b/src/Core/src/Handlers/Page/PageHandler.Standard.cs
index 7395d88db589..14d06e3b9a3b 100644
--- a/src/Core/src/Handlers/Page/PageHandler.Standard.cs
+++ b/src/Core/src/Handlers/Page/PageHandler.Standard.cs
@@ -5,5 +5,9 @@ namespace Microsoft.Maui.Handlers
 	public partial class PageHandler : ViewHandler<IPage, object>
 	{
 		protected override object CreateNativeView() => throw new NotImplementedException();
+
+		public static void MapTitle(PageHandler handler, IPage page)
+		{
+		}
 	}
 }
diff --git a/src/Core/src/Handlers/Page/PageHandler.Windows.cs b/src/Core/src/Handlers/Page/PageHandler.Windows.cs
index 6a45ce7068a1..91078dc93273 100644
--- a/src/Core/src/Handlers/Page/PageHandler.Windows.cs
+++ b/src/Core/src/Handlers/Page/PageHandler.Windows.cs
@@ -18,7 +18,9 @@ public override void SetVirtualView(IView view)
 			NativeView.CrossPlatformArrange = VirtualView.Arrange;
 
 			NativeView.Children.Clear();
-			NativeView.Children.Add(VirtualView.Content.ToNative(MauiContext));
+
+			if (VirtualView.Content != null)
+				NativeView.Children.Add(VirtualView.Content.ToNative(MauiContext));
 		}
 
 		protected override PagePanel CreateNativeView()
@@ -36,5 +38,9 @@ protected override PagePanel CreateNativeView()
 
 			return view;
 		}
+
+		public static void MapTitle(PageHandler handler, IPage page)
+		{
+		}
 	}
 }
diff --git a/src/Core/src/Handlers/Page/PageHandler.cs b/src/Core/src/Handlers/Page/PageHandler.cs
index 785bd1efd277..9001ff3a7f9c 100644
--- a/src/Core/src/Handlers/Page/PageHandler.cs
+++ b/src/Core/src/Handlers/Page/PageHandler.cs
@@ -1,22 +1,19 @@
 #nullable enable
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace Microsoft.Maui.Handlers
 {
 	public partial class PageHandler : IViewHandler
 	{
-		public static PropertyMapper<IPage> LayoutMapper = new PropertyMapper<IPage>(ViewHandler.ViewMapper)
+		public static PropertyMapper<IPage, PageHandler> PageMapper = new PropertyMapper<IPage, PageHandler>(ViewHandler.ViewMapper)
 		{
+			[nameof(IPage.Title)] = MapTitle,
 		};
 
-		public PageHandler() : base(LayoutMapper)
+		public PageHandler() : base(PageMapper)
 		{
 
 		}
 
-		public PageHandler(PropertyMapper? mapper = null) : base(mapper ?? LayoutMapper)
+		public PageHandler(PropertyMapper? mapper = null) : base(mapper ?? PageMapper)
 		{
 
 		}
diff --git a/src/Core/src/Handlers/Page/PageHandler.iOS.cs b/src/Core/src/Handlers/Page/PageHandler.iOS.cs
index c9c0596d4700..f86310166e2b 100644
--- a/src/Core/src/Handlers/Page/PageHandler.iOS.cs
+++ b/src/Core/src/Handlers/Page/PageHandler.iOS.cs
@@ -1,29 +1,26 @@
 using System;
 using System.Linq;
-
-#if __IOS__ || IOS || MACCATALYST
+using UIKit;
 using NativeView = UIKit.UIView;
-#else
-using NativeView = AppKit.NSView;
-#endif
 
 namespace Microsoft.Maui.Handlers
 {
-	public partial class PageHandler : ViewHandler<IPage, PageView>
+	public partial class PageHandler : ViewHandler<IPage, PageView>, INativeViewHandler
 	{
+		PageViewController? _pageViewController;
+		UIViewController? INativeViewHandler.ViewController => _pageViewController;
+
 		protected override PageView CreateNativeView()
 		{
-			if (VirtualView == null)
-			{
-				throw new InvalidOperationException($"{nameof(VirtualView)} must be set to create a LayoutView");
-			}
+			_ = VirtualView ?? throw new InvalidOperationException($"{nameof(VirtualView)} must be set to create a LayoutView");
+			_ = MauiContext ?? throw new InvalidOperationException($"{nameof(MauiContext)} cannot be null");
 
-			var view = new PageView
-			{
-				CrossPlatformArrange = VirtualView.Arrange,
-			};
+			_pageViewController = new PageViewController(VirtualView, this.MauiContext);
 
-			return view;
+			if (_pageViewController.CurrentNativeView is PageView pv)
+				return pv;
+
+			throw new InvalidOperationException($"PageViewController.View must be a PageView");
 		}
 
 		public override void SetVirtualView(IView view)
@@ -39,7 +36,15 @@ public override void SetVirtualView(IView view)
 			oldChildren.ForEach(x => x.RemoveFromSuperview());
 
 			NativeView.CrossPlatformArrange = VirtualView.Arrange;
-			NativeView.AddSubview(VirtualView.Content.ToNative(MauiContext));
+
+			if (VirtualView.Content != null)
+				NativeView.AddSubview(VirtualView.Content.ToNative(MauiContext));
+		}
+
+		public static void MapTitle(PageHandler handler, IPage page)
+		{
+			if (handler._pageViewController != null)
+				handler._pageViewController.Title = page.Title;
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/src/Core/src/Handlers/Picker/PickerHandler.Android.cs b/src/Core/src/Handlers/Picker/PickerHandler.Android.cs
index a400e77fe4e8..da8b7308f126 100644
--- a/src/Core/src/Handlers/Picker/PickerHandler.Android.cs
+++ b/src/Core/src/Handlers/Picker/PickerHandler.Android.cs
@@ -18,9 +18,6 @@ protected override void ConnectHandler(MauiPicker nativeView)
 			nativeView.FocusChange += OnFocusChange;
 			nativeView.Click += OnClick;
 
-			if (VirtualView != null && VirtualView.Items is INotifyCollectionChanged notifyCollection)
-				notifyCollection.CollectionChanged += OnCollectionChanged;
-
 			base.ConnectHandler(nativeView);
 		}
 
@@ -29,11 +26,17 @@ protected override void DisconnectHandler(MauiPicker nativeView)
 			nativeView.FocusChange -= OnFocusChange;
 			nativeView.Click -= OnClick;
 
-			if (VirtualView != null && VirtualView.Items is INotifyCollectionChanged notifyCollection)
-				notifyCollection.CollectionChanged -= OnCollectionChanged;
-
 			base.DisconnectHandler(nativeView);
 		}
+		void Reload()
+		{
+			if (VirtualView == null || NativeView == null)
+				return;
+
+			NativeView.UpdatePicker(VirtualView);
+		}
+		public static void MapReload(PickerHandler handler, IPicker picker) => handler.Reload();
+
 		public static void MapTitle(PickerHandler handler, IPicker picker)
 		{
 			handler.NativeView?.UpdateTitle(picker);
@@ -94,7 +97,7 @@ void OnClick(object? sender, EventArgs e)
 				{
 					builder.SetTitle(VirtualView.Title ?? string.Empty);
 
-					string[] items = VirtualView.Items.ToArray();
+					string[] items = VirtualView.GetItemsAsArray();
 
 					builder.SetItems(items, (EventHandler<Android.Content.DialogClickEventArgs>)((s, e) =>
 					{
@@ -122,13 +125,5 @@ void OnClick(object? sender, EventArgs e)
 				_dialog.Show();
 			}
 		}
-
-		void OnCollectionChanged(object? sender, EventArgs e)
-		{
-			if (VirtualView == null || NativeView == null)
-				return;
-
-			NativeView.UpdatePicker(VirtualView);
-		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Handlers/Picker/PickerHandler.Standard.cs b/src/Core/src/Handlers/Picker/PickerHandler.Standard.cs
index f98e843ee33d..f49da739ca47 100644
--- a/src/Core/src/Handlers/Picker/PickerHandler.Standard.cs
+++ b/src/Core/src/Handlers/Picker/PickerHandler.Standard.cs
@@ -6,6 +6,7 @@ public partial class PickerHandler : ViewHandler<IPicker, object>
 	{
 		protected override object CreateNativeView() => throw new NotImplementedException();
 
+		public static void MapReload(PickerHandler handler, IPicker picker) { }
 		public static void MapTitle(PickerHandler handler, IPicker view) { }
 		public static void MapSelectedIndex(PickerHandler handler, IPicker view) { }
 		public static void MapCharacterSpacing(PickerHandler handler, IPicker view) { }
diff --git a/src/Core/src/Handlers/Picker/PickerHandler.Windows.cs b/src/Core/src/Handlers/Picker/PickerHandler.Windows.cs
index 3d4ac091d956..fe69c0063fc1 100644
--- a/src/Core/src/Handlers/Picker/PickerHandler.Windows.cs
+++ b/src/Core/src/Handlers/Picker/PickerHandler.Windows.cs
@@ -1,28 +1,85 @@
-using System;
-using Microsoft.UI.Xaml.Controls;
+#nullable enable
+using WBrush = Microsoft.UI.Xaml.Media.Brush;
+using WSelectionChangedEventArgs = Microsoft.UI.Xaml.Controls.SelectionChangedEventArgs;
 
 namespace Microsoft.Maui.Handlers
 {
-	public partial class PickerHandler : ViewHandler<IPicker, ComboBox>
+	public partial class PickerHandler : ViewHandler<IPicker, MauiComboBox>
 	{
-		protected override ComboBox CreateNativeView() => new ComboBox();
+		WBrush? _defaultForeground;
 
-		[MissingMapper]
-		public static void MapTitle(PickerHandler handler, IPicker view) { }
+		protected override MauiComboBox CreateNativeView()
+		{
+			var nativePicker = new MauiComboBox();
 
-		[MissingMapper]
-		public static void MapSelectedIndex(PickerHandler handler, IPicker view) { }
+			if (VirtualView != null)
+				nativePicker.ItemsSource = new ItemDelegateList<string>(VirtualView);
 
-		[MissingMapper]
-		public static void MapCharacterSpacing(PickerHandler handler, IPicker view) { }
+			return nativePicker;
+		}
 
-		[MissingMapper]
-		public static void MapFont(PickerHandler handler, IPicker view) { }
+		protected override void ConnectHandler(MauiComboBox nativeView)
+		{
+			nativeView.SelectionChanged += OnControlSelectionChanged;
+		}
 
-		[MissingMapper]
-		public static void MapTextColor(PickerHandler handler, IPicker view) { }
+		protected override void DisconnectHandler(MauiComboBox nativeView)
+		{
+			nativeView.SelectionChanged -= OnControlSelectionChanged;
+		}
 
-		[MissingMapper]
-		public static void MapHorizontalTextAlignment(PickerHandler handler, IPicker view) { }
+		protected override void SetupDefaults(MauiComboBox nativeView)
+		{
+			_defaultForeground = nativeView.Foreground;
+
+			base.SetupDefaults(nativeView);
+		}
+		void Reload()
+		{
+
+			if (VirtualView == null || NativeView == null)
+				return;
+			NativeView.ItemsSource = new ItemDelegateList<string>(VirtualView);
+		}
+
+		public static void MapReload(PickerHandler handler, IPicker picker) => handler.Reload();
+
+		public static void MapTitle(PickerHandler handler, IPicker picker) 
+		{
+			handler.NativeView?.UpdateTitle(picker);
+		}
+
+		public static void MapSelectedIndex(PickerHandler handler, IPicker picker)
+		{
+			handler.NativeView?.UpdateSelectedIndex(picker);
+		}
+
+		public static void MapCharacterSpacing(PickerHandler handler, IPicker picker) 
+		{
+			handler.NativeView?.UpdateCharacterSpacing(picker);
+		}
+
+		public static void MapFont(PickerHandler handler, IPicker picker) 
+		{
+			var fontManager = handler.GetRequiredService<IFontManager>();
+
+			handler.NativeView?.UpdateFont(picker, fontManager);
+		}
+
+		public static void MapTextColor(PickerHandler handler, IPicker picker)
+		{
+			handler.NativeView?.UpdateTextColor(picker, handler._defaultForeground);
+		}
+
+		public static void MapHorizontalTextAlignment(PickerHandler handler, IPicker picker)
+		{
+			handler.NativeView?.UpdateHorizontalTextAlignment(picker);
+		}
+
+		void OnControlSelectionChanged(object? sender, WSelectionChangedEventArgs e)
+		{
+			if (VirtualView != null && NativeView != null)
+				VirtualView.SelectedIndex = NativeView.SelectedIndex;
+		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Core/src/Handlers/Picker/PickerHandler.cs b/src/Core/src/Handlers/Picker/PickerHandler.cs
index 3e6bda43f9ac..7945c4170414 100644
--- a/src/Core/src/Handlers/Picker/PickerHandler.cs
+++ b/src/Core/src/Handlers/Picker/PickerHandler.cs
@@ -10,6 +10,10 @@ public partial class PickerHandler
 			[nameof(IPicker.TextColor)] = MapTextColor,
 			[nameof(IPicker.Title)] = MapTitle,
 			[nameof(IPicker.HorizontalTextAlignment)] = MapHorizontalTextAlignment,
+			Actions =
+			{
+				["Reload"] = MapReload,
+			}
 		};
 
 		public PickerHandler() : base(PickerMapper)
diff --git a/src/Core/src/Handlers/Picker/PickerHandler.iOS.cs b/src/Core/src/Handlers/Picker/PickerHandler.iOS.cs
index 3f1d8d885d7b..b5a70aeea40c 100644
--- a/src/Core/src/Handlers/Picker/PickerHandler.iOS.cs
+++ b/src/Core/src/Handlers/Picker/PickerHandler.iOS.cs
@@ -23,11 +23,11 @@ protected override MauiPicker CreateNativeView()
 			var doneButton = new UIBarButtonItem(UIBarButtonSystemItem.Done, (o, a) =>
 			{
 				var pickerSource = (PickerSource)_pickerView.Model;
-
-				if (pickerSource.SelectedIndex == -1 && VirtualView?.Items != null && VirtualView.Items.Count > 0)
+				var count = VirtualView?.GetCount() ?? 0;
+				if (pickerSource.SelectedIndex == -1 && count > 0)
 					UpdatePickerSelectedIndex(0);
 
-				if (VirtualView?.SelectedIndex == -1 && VirtualView.Items != null && VirtualView.Items.Count > 0)
+				if (VirtualView?.SelectedIndex == -1 && count > 0)
 				{
 					NativeView?.SetSelectedIndex(VirtualView, 0);
 				}
@@ -62,8 +62,6 @@ protected override void ConnectHandler(MauiPicker nativeView)
 			nativeView.EditingDidEnd += OnEnded;
 			nativeView.EditingChanged += OnEditing;
 
-			if (VirtualView != null && VirtualView.Items is INotifyCollectionChanged notifyCollectionChanged)
-				notifyCollectionChanged.CollectionChanged += OnCollectionChanged;
 
 			base.ConnectHandler(nativeView);
 		}
@@ -73,9 +71,6 @@ protected override void DisconnectHandler(MauiPicker nativeView)
 			nativeView.EditingDidEnd -= OnEnded;
 			nativeView.EditingChanged -= OnEditing;
 
-			if (VirtualView != null && VirtualView.Items is INotifyCollectionChanged notifyCollectionChanged)
-				notifyCollectionChanged.CollectionChanged -= OnCollectionChanged;
-
 			if (_pickerView != null)
 			{
 				if (_pickerView.Model != null)
@@ -91,6 +86,15 @@ protected override void DisconnectHandler(MauiPicker nativeView)
 
 			base.DisconnectHandler(nativeView);
 		}
+		void Reload()
+		{
+			if (VirtualView == null || NativeView == null)
+				return;
+
+			NativeView.UpdatePicker(VirtualView);
+		}
+
+		public static void MapReload(PickerHandler handler, IPicker picker) => handler.Reload();
 
 		public static void MapTitle(PickerHandler handler, IPicker picker)
 		{
@@ -122,14 +126,6 @@ public static void MapHorizontalTextAlignment(PickerHandler handler, IPicker pic
 		[MissingMapper]
 		public static void MapTextColor(PickerHandler handler, IPicker view) { }
 
-		void OnCollectionChanged(object? sender, EventArgs e)
-		{
-			if (VirtualView == null || NativeView == null)
-				return;
-
-			NativeView.UpdatePicker(VirtualView);
-		}
-
 		void OnEnded(object? sender, EventArgs eventArgs)
 		{
 			if (_pickerView == null)
@@ -150,8 +146,8 @@ void OnEditing(object? sender, EventArgs eventArgs)
 
 			// Reset the TextField's Text so it appears as if typing with a keyboard does not work.
 			var selectedIndex = VirtualView.SelectedIndex;
-			var items = VirtualView.Items;
-			NativeView.Text = selectedIndex == -1 || items == null ? string.Empty : items[selectedIndex];
+
+			NativeView.Text = VirtualView.GetItem(selectedIndex);
 
 			// Also clears the undo stack (undo/redo possible on iPads)
 			NativeView.UndoManager.RemoveAllActions();
@@ -162,7 +158,7 @@ void UpdatePickerFromPickerSource(PickerSource pickerSource)
 			if (VirtualView == null || NativeView == null)
 				return;
 
-			NativeView.Text = pickerSource.SelectedItem;
+			NativeView.Text = VirtualView.GetItem(pickerSource.SelectedIndex);
 			VirtualView.SelectedIndex = pickerSource.SelectedIndex;
 		}
 
@@ -173,7 +169,6 @@ void UpdatePickerSelectedIndex(int formsIndex)
 
 			var source = (PickerSource)_pickerView.Model;
 			source.SelectedIndex = formsIndex;
-			source.SelectedItem = formsIndex >= 0 ? VirtualView.Items[formsIndex] : null;
 			_pickerView.Select(Math.Max(formsIndex, 0), 0, true);
 		}
 	}
@@ -190,36 +185,19 @@ public PickerSource(IPicker? virtualView)
 
 		public int SelectedIndex { get; internal set; }
 
-		public string? SelectedItem { get; internal set; }
-
 		public override nint GetComponentCount(UIPickerView picker)
 		{
 			return 1;
 		}
 
-		public override nint GetRowsInComponent(UIPickerView pickerView, nint component)
-		{
-			return _virtualView?.Items != null ? _virtualView.Items.Count : 0;
-		}
+		public override nint GetRowsInComponent(UIPickerView pickerView, nint component) =>
+			_virtualView?.GetCount() ?? 0;
 
-		public override string GetTitle(UIPickerView picker, nint row, nint component)
-		{
-			return _virtualView != null ? _virtualView.Items[(int)row] : string.Empty;
-		}
+		public override string GetTitle(UIPickerView picker, nint row, nint component) =>
+			_virtualView?.GetItem((int)row) ?? "";
 
-		public override void Selected(UIPickerView picker, nint row, nint component)
-		{
-			if (_virtualView?.Items.Count == 0)
-			{
-				SelectedItem = null;
-				SelectedIndex = -1;
-			}
-			else
-			{
-				SelectedItem = _virtualView?.Items[(int)row];
-				SelectedIndex = (int)row;
-			}
-		}
+		public override void Selected(UIPickerView picker, nint row, nint component) =>
+			SelectedIndex = (int)row;
 
 		protected override void Dispose(bool disposing)
 		{
diff --git a/src/Core/src/Handlers/ProgressBar/ProgressBarHandler.Windows.cs b/src/Core/src/Handlers/ProgressBar/ProgressBarHandler.Windows.cs
index 95c876dee9fb..55f8f99a1f8d 100644
--- a/src/Core/src/Handlers/ProgressBar/ProgressBarHandler.Windows.cs
+++ b/src/Core/src/Handlers/ProgressBar/ProgressBarHandler.Windows.cs
@@ -1,4 +1,6 @@
-using Microsoft.UI.Xaml.Controls;
+#nullable enable
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
 
 namespace Microsoft.Maui.Handlers
 {
@@ -6,9 +8,24 @@ public partial class ProgressBarHandler : ViewHandler<IProgress, ProgressBar>
 	{
 		protected override ProgressBar CreateNativeView() => new ProgressBar { Minimum = 0, Maximum = 1 };
 
+		protected override void ConnectHandler(ProgressBar nativeView)
+		{
+			nativeView.ValueChanged += OnProgressBarValueChanged;
+		}
+
+		protected override void DisconnectHandler(ProgressBar nativeView)
+		{
+			nativeView.ValueChanged -= OnProgressBarValueChanged;
+		}
+
 		public static void MapProgress(ProgressBarHandler handler, IProgress progress)	
 		{
 			handler.NativeView?.UpdateProgress(progress);
 		}
+
+		void OnProgressBarValueChanged(object? sender, RangeBaseValueChangedEventArgs rangeBaseValueChangedEventArgs)
+		{
+			VirtualView?.InvalidateMeasure();
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Handlers/SearchBar/SearchBarHandler.Windows.cs b/src/Core/src/Handlers/SearchBar/SearchBarHandler.Windows.cs
index 2ac167219556..2ea3d5c5b11a 100644
--- a/src/Core/src/Handlers/SearchBar/SearchBarHandler.Windows.cs
+++ b/src/Core/src/Handlers/SearchBar/SearchBarHandler.Windows.cs
@@ -1,4 +1,5 @@
-using Microsoft.UI.Xaml.Controls;
+#nullable enable
+using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.Maui.Handlers
 {
@@ -10,22 +11,38 @@ public partial class SearchBarHandler : ViewHandler<ISearchBar, AutoSuggestBox>
 			QueryIcon = new SymbolIcon(Symbol.Find)
 		};
 
+		protected override void ConnectHandler(AutoSuggestBox nativeView)
+		{
+			nativeView.QuerySubmitted += OnQuerySubmitted;
+			nativeView.TextChanged += OnTextChanged;
+		}
+
+		protected override void DisconnectHandler(AutoSuggestBox nativeView)
+		{
+			nativeView.QuerySubmitted -= OnQuerySubmitted;
+			nativeView.TextChanged -= OnTextChanged;
+		}
+
 		public static void MapText(SearchBarHandler handler, ISearchBar searchBar)
 		{
 			handler.NativeView?.UpdateText(searchBar);
 		}
 
-		[MissingMapper]
-		public static void MapPlaceholder(IViewHandler handler, ISearchBar searchBar) { }
-
+		public static void MapPlaceholder(SearchBarHandler handler, ISearchBar searchBar)
+		{
+			handler.NativeView?.UpdatePlaceholder(searchBar);
+		}
+			
 		[MissingMapper]
 		public static void MapHorizontalTextAlignment(IViewHandler handler, ISearchBar searchBar) { }
 
 		[MissingMapper]
 		public static void MapFont(IViewHandler handler, ISearchBar searchBar) { }
 
-		[MissingMapper]
-		public static void MapCharacterSpacing(IViewHandler handler, ISearchBar searchBar) { }
+		public static void MapCharacterSpacing(SearchBarHandler handler, ISearchBar searchBar) 
+		{
+			handler.NativeView?.UpdateCharacterSpacing(searchBar);
+		}
 
 		[MissingMapper]
 		public static void MapTextColor(IViewHandler handler, ISearchBar searchBar) { }
@@ -38,5 +55,30 @@ public static void MapMaxLength(IViewHandler handler, ISearchBar searchBar) { }
 
 		[MissingMapper]
 		public static void MapIsReadOnly(IViewHandler handler, ISearchBar searchBar) { }
+
+		void OnQuerySubmitted(AutoSuggestBox? sender, AutoSuggestBoxQuerySubmittedEventArgs e)
+		{
+			if (VirtualView == null)
+				return;
+
+			// Modifies the text of the control if it does not match the query.
+			// This is possible because OnTextChanged is fired with a delay
+			if (e.QueryText != VirtualView.Text)
+				VirtualView.Text = e.QueryText;
+
+			VirtualView.SearchButtonPressed();
+		}
+
+		[PortHandler]
+		void OnTextChanged(AutoSuggestBox? sender, AutoSuggestBoxTextChangedEventArgs e)
+		{
+			if (e.Reason == AutoSuggestionBoxTextChangeReason.ProgrammaticChange)
+				return;
+
+			if (VirtualView == null || sender == null)
+				return;
+
+			VirtualView.Text = sender.Text;
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Handlers/Slider/SliderHandler.Windows.cs b/src/Core/src/Handlers/Slider/SliderHandler.Windows.cs
index d019fe8606c3..e6c9ec703504 100644
--- a/src/Core/src/Handlers/Slider/SliderHandler.Windows.cs
+++ b/src/Core/src/Handlers/Slider/SliderHandler.Windows.cs
@@ -1,28 +1,102 @@
-using System;
+#nullable enable
+using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
 
 namespace Microsoft.Maui.Handlers
 {
 	public partial class SliderHandler : ViewHandler<ISlider, Slider>
 	{
-		protected override Slider CreateNativeView() => new Slider();
+		static Brush? DefaultForegroundColor;
+		static Brush? DefaultBackgroundColor;
+		
+		PointerEventHandler? _pointerPressedHandler;
+		PointerEventHandler? _pointerReleasedHandler;
 
-		[MissingMapper]
-		public static void MapMinimum(IViewHandler handler, ISlider slider) { }
+		protected override Slider CreateNativeView()
+		{
+			var slider = new Slider
+			{
+				IsThumbToolTipEnabled = false
+			};
 
-		[MissingMapper]
-		public static void MapMaximum(IViewHandler handler, ISlider slider) { }
+			return slider;
+		}
 
-		[MissingMapper]
-		public static void MapValue(IViewHandler handler, ISlider slider) { }
+		protected override void ConnectHandler(Slider nativeView)
+		{
+			nativeView.ValueChanged += OnNativeValueChanged;
 
-		[MissingMapper]
-		public static void MapMinimumTrackColor(IViewHandler handler, ISlider slider) { }
+			_pointerPressedHandler = new PointerEventHandler(OnPointerPressed);
+			_pointerReleasedHandler = new PointerEventHandler(OnPointerReleased);
 
-		[MissingMapper]
-		public static void MapMaximumTrackColor(IViewHandler handler, ISlider slider) { }
+			nativeView.AddHandler(UIElement.PointerPressedEvent, _pointerPressedHandler, true);
+			nativeView.AddHandler(UIElement.PointerReleasedEvent, _pointerReleasedHandler, true);
+			nativeView.AddHandler(UIElement.PointerCanceledEvent, _pointerReleasedHandler, true);
+		}
+
+		protected override void DisconnectHandler(Slider nativeView)
+		{
+			nativeView.ValueChanged -= OnNativeValueChanged;
+
+			nativeView.RemoveHandler(UIElement.PointerPressedEvent, _pointerPressedHandler);
+			nativeView.RemoveHandler(UIElement.PointerReleasedEvent, _pointerReleasedHandler);
+			nativeView.RemoveHandler(UIElement.PointerCanceledEvent, _pointerReleasedHandler);
+
+			_pointerPressedHandler = null;
+			_pointerReleasedHandler = null;
+		}
+
+		protected override void SetupDefaults(Slider nativeView)
+		{
+			DefaultForegroundColor = nativeView.Foreground;
+			DefaultBackgroundColor = nativeView.Background;
+		}
+
+		public static void MapMinimum(SliderHandler handler, ISlider slider)
+		{
+			handler.NativeView?.UpdateMinimum(slider);
+		}
+
+		public static void MapMaximum(SliderHandler handler, ISlider slider)
+		{
+			handler.NativeView?.UpdateMaximum(slider);
+		}
+
+		public static void MapValue(SliderHandler handler, ISlider slider)
+		{
+			handler.NativeView?.UpdateValue(slider);
+		}
+
+		public static void MapMinimumTrackColor(SliderHandler handler, ISlider slider)
+		{
+			handler.NativeView?.UpdateMinimumTrackColor(slider, DefaultForegroundColor);
+		}
+
+		public static void MapMaximumTrackColor(SliderHandler handler, ISlider slider)
+		{
+			handler.NativeView?.UpdateMaximumTrackColor(slider, DefaultBackgroundColor);
+		}
 
 		[MissingMapper]
-		public static void MapThumbColor(IViewHandler handler, ISlider slider) { }
+		public static void MapThumbColor(SliderHandler handler, ISlider slider) { }
+
+		void OnNativeValueChanged(object? sender, RangeBaseValueChangedEventArgs e)
+		{
+			if (VirtualView != null)
+				VirtualView.Value = e.NewValue;
+		}
+
+		void OnPointerPressed(object? sender, PointerRoutedEventArgs e)
+		{
+			VirtualView?.DragStarted();
+		}
+
+		void OnPointerReleased(object? sender, PointerRoutedEventArgs e)
+		{
+			VirtualView?.DragCompleted();
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Handlers/TimePicker/TimePickerHandler.Windows.cs b/src/Core/src/Handlers/TimePicker/TimePickerHandler.Windows.cs
index d735209657d8..81950a0e1ff1 100644
--- a/src/Core/src/Handlers/TimePicker/TimePickerHandler.Windows.cs
+++ b/src/Core/src/Handlers/TimePicker/TimePickerHandler.Windows.cs
@@ -1,16 +1,18 @@
-using System;
+using Microsoft.UI.Xaml.Controls;
 
 namespace Microsoft.Maui.Handlers
 {
-	public partial class TimePickerHandler : ViewHandler<ITimePicker, Microsoft.UI.Xaml.Controls.TimePicker>
+	public partial class TimePickerHandler : ViewHandler<ITimePicker, TimePicker>
 	{
-		protected override Microsoft.UI.Xaml.Controls.TimePicker CreateNativeView() => new Microsoft.UI.Xaml.Controls.TimePicker();
+		protected override TimePicker CreateNativeView() => new TimePicker();
 
 		[MissingMapper]
 		public static void MapFormat(TimePickerHandler handler, ITimePicker view) { }
 
-		[MissingMapper]
-		public static void MapTime(TimePickerHandler handler, ITimePicker view) { }
+		public static void MapTime(TimePickerHandler handler, ITimePicker timePicker)
+		{
+			handler.NativeView?.UpdateTime(timePicker);
+		}
 
 		[MissingMapper]
 		public static void MapCharacterSpacing(TimePickerHandler handler, ITimePicker view) { }
diff --git a/src/Core/src/Handlers/View/ViewHandler.cs b/src/Core/src/Handlers/View/ViewHandler.cs
index 2891d457067a..98a598126eff 100644
--- a/src/Core/src/Handlers/View/ViewHandler.cs
+++ b/src/Core/src/Handlers/View/ViewHandler.cs
@@ -1,10 +1,8 @@
 #nullable enable
 using Microsoft.Maui.Graphics;
 using System;
-#if __IOS__
+#if __IOS__ || MACCATALYST
 using NativeView = UIKit.UIView;
-#elif __MACOS__
-using NativeView = AppKit.NSView;
 #elif MONOANDROID
 using NativeView = Android.Views.View;
 #elif WINDOWS
@@ -20,10 +18,15 @@ public abstract partial class ViewHandler : IViewHandler
 		public static PropertyMapper<IView> ViewMapper = new PropertyMapper<IView>
 		{
 			[nameof(IView.AutomationId)] = MapAutomationId,
-			[nameof(IView.BackgroundColor)] = MapBackgroundColor,
-			[nameof(IView.Frame)] = MapFrame,
+			[nameof(IView.Visibility)] = MapVisibility,
+			[nameof(IView.Background)] = MapBackground,
+			[nameof(IView.Width)] = MapWidth,
+			[nameof(IView.Height)] = MapHeight,
 			[nameof(IView.IsEnabled)] = MapIsEnabled,
 			[nameof(IView.Semantics)] = MapSemantics,
+			Actions = {
+					[nameof(IFrameworkElement.InvalidateMeasure)] = MapInvalidateMeasure
+				}
 		};
 
 		internal ViewHandler()
@@ -60,7 +63,7 @@ public bool HasContainer
 		public object? NativeView { get; private protected set; }
 
 		public IView? VirtualView { get; private protected set; }
-		
+
 		public void SetMauiContext(IMauiContext mauiContext) => MauiContext = mauiContext;
 
 		public abstract void SetVirtualView(IView view);
@@ -71,8 +74,7 @@ public bool HasContainer
 
 		public abstract Size GetDesiredSize(double widthConstraint, double heightConstraint);
 
-		// TODO ezhart This should maybe be called NativeArrange or something
-		public abstract void SetFrame(Rectangle frame);
+		public abstract void NativeArrange(Rectangle frame);
 
 		private protected void ConnectHandler(NativeView? nativeView)
 		{
@@ -90,9 +92,14 @@ private protected void DisconnectHandler(NativeView? nativeView)
 			VirtualView = null;
 		}
 
-		public static void MapFrame(IViewHandler handler, IView view)
+		public static void MapWidth(IViewHandler handler, IView view)
 		{
-			handler.SetFrame(view.Frame);
+			((NativeView?)handler.NativeView)?.UpdateWidth(view);
+		}
+
+		public static void MapHeight(IViewHandler handler, IView view)
+		{
+			((NativeView?)handler.NativeView)?.UpdateHeight(view);
 		}
 
 		public static void MapIsEnabled(IViewHandler handler, IView view)
@@ -100,9 +107,14 @@ public static void MapIsEnabled(IViewHandler handler, IView view)
 			((NativeView?)handler.NativeView)?.UpdateIsEnabled(view);
 		}
 
-		public static void MapBackgroundColor(IViewHandler handler, IView view)
+		public static void MapVisibility(IViewHandler handler, IView view)
+		{
+			((NativeView?)handler.NativeView)?.UpdateVisibility(view);
+		}
+
+		public static void MapBackground(IViewHandler handler, IView view)
 		{
-			((NativeView?)handler.NativeView)?.UpdateBackgroundColor(view);
+			((NativeView?)handler.NativeView)?.UpdateBackground(view);
 		}
 
 		public static void MapAutomationId(IViewHandler handler, IView view)
@@ -117,5 +129,10 @@ public static void MapSemantics(IViewHandler handler, IView view)
 			MappingSemantics(handler, view);
 			((NativeView?)handler.NativeView)?.UpdateSemantics(view);
 		}
+
+		public static void MapInvalidateMeasure(IViewHandler handler, IView view)
+		{
+			((NativeView?)handler.NativeView)?.InvalidateMeasure(view);
+		}
 	}
 }
diff --git a/src/Core/src/Handlers/View/ViewHandlerOfT.Android.cs b/src/Core/src/Handlers/View/ViewHandlerOfT.Android.cs
index 0993bfad7257..e449de09b7aa 100644
--- a/src/Core/src/Handlers/View/ViewHandlerOfT.Android.cs
+++ b/src/Core/src/Handlers/View/ViewHandlerOfT.Android.cs
@@ -1,3 +1,5 @@
+using System;
+using System.Runtime.CompilerServices;
 using Android.Content;
 using Android.Views;
 using AndroidX.Core.View;
@@ -11,7 +13,13 @@ public partial class ViewHandler<TVirtualView, TNativeView> : INativeViewHandler
 		View? INativeViewHandler.NativeView => (View?)base.NativeView;
 		public Context? Context => MauiContext?.Context;
 
-		public override void SetFrame(Rectangle frame)
+		protected Context ContextWithValidation([CallerMemberName] string callerName = "")
+		{
+			_ = Context ?? throw new InvalidOperationException($"Context cannot be null here: {callerName}");
+			return Context;
+		}
+
+		public override void NativeArrange(Rectangle frame)
 		{
 			var nativeView = NativeView;
 
diff --git a/src/Core/src/Handlers/View/ViewHandlerOfT.Standard.cs b/src/Core/src/Handlers/View/ViewHandlerOfT.Standard.cs
index 9370d306253b..46116c195116 100644
--- a/src/Core/src/Handlers/View/ViewHandlerOfT.Standard.cs
+++ b/src/Core/src/Handlers/View/ViewHandlerOfT.Standard.cs
@@ -4,7 +4,7 @@ namespace Microsoft.Maui.Handlers
 {
 	public abstract partial class ViewHandler<TVirtualView, TNativeView>
 	{
-		public override void SetFrame(Rectangle rect)
+		public override void NativeArrange(Rectangle rect)
 		{
 
 		}
diff --git a/src/Core/src/Handlers/View/ViewHandlerOfT.Windows.cs b/src/Core/src/Handlers/View/ViewHandlerOfT.Windows.cs
index 35c26a5ff7b6..0a5839c5e92c 100644
--- a/src/Core/src/Handlers/View/ViewHandlerOfT.Windows.cs
+++ b/src/Core/src/Handlers/View/ViewHandlerOfT.Windows.cs
@@ -1,5 +1,4 @@
 #nullable enable
-using System;
 using Microsoft.Maui.Graphics;
 using Microsoft.UI.Xaml;
 
@@ -9,7 +8,7 @@ public abstract partial class ViewHandler<TVirtualView, TNativeView> : INativeVi
 	{
 		FrameworkElement? INativeViewHandler.NativeView => (FrameworkElement?)base.NativeView;
 
-		public override void SetFrame(Rectangle rect)
+		public override void NativeArrange(Rectangle rect)
 		{
 			var nativeView = NativeView;
 
@@ -30,37 +29,11 @@ public override Size GetDesiredSize(double widthConstraint, double heightConstra
 			if (widthConstraint < 0 || heightConstraint < 0)
 				return Size.Zero;
 
-			var explicitWidth = VirtualView.Width;
-			var explicitHeight = VirtualView.Height;
-			var useExplicitWidth = explicitWidth >= 0;
-			var useExplicitHeight = explicitHeight >= 0;
-
-			if (useExplicitWidth)
-			{
-				widthConstraint = Math.Min(VirtualView.Width, widthConstraint);
-			}
-
-			if (useExplicitHeight)
-			{
-				heightConstraint = Math.Min(VirtualView.Height, heightConstraint);
-			}
-
 			var measureConstraint = new Windows.Foundation.Size(widthConstraint, heightConstraint);
 
 			NativeView.Measure(measureConstraint);
 
-			var desiredWidth = NativeView.DesiredSize.Width;
-			var desiredHeight = NativeView.DesiredSize.Height;
-
-			var resultWidth = useExplicitWidth 
-				? Math.Max(desiredWidth, explicitWidth) 
-				: desiredWidth;
-
-			var resultHeight = useExplicitHeight
-				? Math.Max(desiredHeight, explicitHeight)
-				: desiredHeight;
-
-			return new Size(resultWidth, resultHeight);
+			return new Size(NativeView.DesiredSize.Width, NativeView.DesiredSize.Height);
 		}
 
 		protected override void SetupContainer()
diff --git a/src/Core/src/Handlers/View/ViewHandlerOfT.cs b/src/Core/src/Handlers/View/ViewHandlerOfT.cs
index d034e4991d4b..1917248e8fee 100644
--- a/src/Core/src/Handlers/View/ViewHandlerOfT.cs
+++ b/src/Core/src/Handlers/View/ViewHandlerOfT.cs
@@ -1,9 +1,8 @@
 #nullable enable
 using System;
-#if __IOS__
+using System.Runtime.CompilerServices;
+#if __IOS__ || MACCATALYST
 using NativeView = UIKit.UIView;
-#elif __MACOS__
-using NativeView = AppKit.NSView;
 #elif MONOANDROID
 using NativeView = Android.Views.View;
 #elif WINDOWS
@@ -27,6 +26,12 @@ public abstract partial class ViewHandler<TVirtualView, TNativeView> : ViewHandl
 		protected PropertyMapper _mapper;
 		static bool HasSetDefaults;
 
+		[HotReload.OnHotReload]
+		static void OnHotReload()
+		{
+			HasSetDefaults = false;
+		}
+
 		protected ViewHandler(PropertyMapper mapper)
 		{
 			_ = mapper ?? throw new ArgumentNullException(nameof(mapper));
@@ -42,6 +47,12 @@ protected ViewHandler(PropertyMapper mapper)
 			private set => base.NativeView = value;
 		}
 
+		protected TNativeView NativeViewValidation([CallerMemberName] string callerName = "")
+		{
+			_ = NativeView ?? throw new InvalidOperationException($"NativeView cannot be null here: {callerName}");
+			return NativeView;
+		}
+
 		public override void SetVirtualView(IView view)
 		{
 			_ = view ?? throw new ArgumentNullException(nameof(view));
@@ -119,10 +130,20 @@ protected virtual void SetupDefaults(TNativeView nativeView) { }
 	public abstract partial class ViewHandler<TVirtualView> : ViewHandler
 		where TVirtualView : class, IView
 	{
+		internal ViewHandler()
+		{
+		}
+
 		public new TVirtualView? VirtualView
 		{
 			get => (TVirtualView?)base.VirtualView;
 			private protected set => base.VirtualView = value;
 		}
+
+		protected TVirtualView VirtualViewWithValidation([CallerMemberName] string callerName = "")
+		{
+			_ = VirtualView ?? throw new InvalidOperationException($"VirtualView cannot be null here: {callerName}");
+			return VirtualView;
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Handlers/View/ViewHandlerOfT.MaciOS.cs b/src/Core/src/Handlers/View/ViewHandlerOfT.iOS.cs
similarity index 68%
rename from src/Core/src/Handlers/View/ViewHandlerOfT.MaciOS.cs
rename to src/Core/src/Handlers/View/ViewHandlerOfT.iOS.cs
index d29e1a11a304..92b10a341dce 100644
--- a/src/Core/src/Handlers/View/ViewHandlerOfT.MaciOS.cs
+++ b/src/Core/src/Handlers/View/ViewHandlerOfT.iOS.cs
@@ -1,31 +1,34 @@
 using Microsoft.Maui.Graphics;
 using UIKit;
 
-#if __IOS__ || IOS || MACCATALYST
-using NativeColor = UIKit.UIColor;
-#else
-using NativeColor = AppKit.NSColor;
-#endif
-
 namespace Microsoft.Maui.Handlers
 {
 	public partial class ViewHandler<TVirtualView, TNativeView> : INativeViewHandler
 	{
 		UIView? INativeViewHandler.NativeView => (UIView?)base.NativeView;
+		UIViewController? INativeViewHandler.ViewController => null;
 
-		public override void SetFrame(Rectangle rect)
+		public override void NativeArrange(Rectangle rect)
 		{
 			if (NativeView != null)
+			{
 				NativeView.Frame = rect.ToCGRect();
+				NativeView.UpdateBackgroundLayerFrame();
+			}
 		}
 
 		public override Size GetDesiredSize(double widthConstraint, double heightConstraint)
 		{
-			if (NativeView == null)
+			if (NativeView == null || VirtualView == null)
 			{
 				return new Size(widthConstraint, heightConstraint);
 			}
 
+			var explicitWidth = VirtualView.Width;
+			var explicitHeight = VirtualView.Height;
+			var hasExplicitWidth = explicitWidth >= 0;
+			var hasExplicitHeight = explicitHeight >= 0;
+
 			var sizeThatFits = NativeView.SizeThatFits(new CoreGraphics.CGSize((float)widthConstraint, (float)heightConstraint));
 
 			var size = new Size(
@@ -35,11 +38,11 @@ public override Size GetDesiredSize(double widthConstraint, double heightConstra
 			if (double.IsInfinity(size.Width) || double.IsInfinity(size.Height))
 			{
 				NativeView.SizeToFit();
-
 				size = new Size(NativeView.Frame.Width, NativeView.Frame.Height);
 			}
 
-			return size;
+			return new Size(hasExplicitWidth ? explicitWidth : size.Width,
+				hasExplicitHeight ? explicitHeight : size.Height);
 		}
 
 		protected override void SetupContainer()
@@ -50,7 +53,6 @@ protected override void SetupContainer()
 		protected override void RemoveContainer()
 		{
 
-
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Hosting/AppHost.cs b/src/Core/src/Hosting/AppHost.cs
new file mode 100644
index 000000000000..89443ea21e68
--- /dev/null
+++ b/src/Core/src/Hosting/AppHost.cs
@@ -0,0 +1,20 @@
+#nullable enable
+
+namespace Microsoft.Maui.Hosting
+{
+	public static class AppHost
+	{
+		public static IAppHostBuilder CreateDefaultBuilder()
+		{
+			var builder = new AppHostBuilder();
+
+			builder.UseMauiServiceProviderFactory(false);
+
+			builder.UseMauiHandlers();
+			builder.ConfigureFonts();
+			builder.ConfigureImageSources();
+
+			return builder;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Hosting/AppHostBuilder.cs b/src/Core/src/Hosting/AppHostBuilder.cs
index dce448c9967e..d69537ad6280 100644
--- a/src/Core/src/Hosting/AppHostBuilder.cs
+++ b/src/Core/src/Hosting/AppHostBuilder.cs
@@ -4,7 +4,9 @@
 using System.Reflection;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
 using Microsoft.Maui.Hosting.Internal;
 
 namespace Microsoft.Maui.Hosting
@@ -37,22 +39,8 @@ public AppHostBuilder()
 
 		public IDictionary<object, object> Properties => new Dictionary<object, object>();
 
-		public static IAppHostBuilder CreateDefaultAppBuilder()
-		{
-			var builder = new AppHostBuilder();
-
-			builder.UseMauiServiceProviderFactory(false);
-
-			builder.UseMauiHandlers();
-			builder.ConfigureFonts();
-
-			return builder;
-		}
-
 		public IAppHost Build()
 		{
-			_services = _serviceCollectionFactory();
-
 			if (_hostBuilt)
 				throw new InvalidOperationException("Build can only be called once.");
 
@@ -64,19 +52,22 @@ public IAppHost Build()
 			CreateHostBuilderContext();
 			BuildAppConfiguration();
 
+			_services = _serviceCollectionFactory();
 			if (_services == null)
 				throw new InvalidOperationException("The ServiceCollection cannot be null");
 
 			BuildServiceCollections(_services);
+			BuildServices(_services);
 
-			CreateServiceProvider(_services);
+			_services.TryAddSingleton<ILoggerFactory, FallbackLoggerFactory>();
 
+			_serviceProvider = ConfigureContainerAndGetProvider(_services);
 			if (_serviceProvider == null)
-				throw new InvalidOperationException($"The ServiceProvider cannot be null");
+				throw new InvalidOperationException($"The IServiceProviderFactory returned a null IServiceProvider.");
 
 			ConfigureServiceCollectionBuilders(_serviceProvider);
 
-			return new AppHost(_serviceProvider, null);
+			return new Internal.AppHost(_serviceProvider, null);
 		}
 
 		public IAppHostBuilder ConfigureAppConfiguration(Action<HostBuilderContext, IConfigurationBuilder> configureDelegate)
@@ -169,7 +160,7 @@ void CreateHostBuilderContext()
 			};
 		}
 
-		void CreateServiceProvider(IServiceCollection services)
+		void BuildServices(IServiceCollection services)
 		{
 			if (services == null)
 				throw new ArgumentNullException(nameof(services));
@@ -183,13 +174,6 @@ void CreateServiceProvider(IServiceCollection services)
 			{
 				configureServicesAction(_hostBuilderContext, services);
 			}
-
-			_serviceProvider = ConfigureContainerAndGetProvider(services);
-
-			if (_serviceProvider == null)
-			{
-				throw new InvalidOperationException($"The IServiceProviderFactory returned a null IServiceProvider.");
-			}
 		}
 
 		void BuildAppConfiguration()
diff --git a/src/Core/src/Hosting/AppHostBuilderExtensions.cs b/src/Core/src/Hosting/AppHostBuilderExtensions.cs
index e95b28fca59f..e854a6870fa1 100644
--- a/src/Core/src/Hosting/AppHostBuilderExtensions.cs
+++ b/src/Core/src/Hosting/AppHostBuilderExtensions.cs
@@ -2,12 +2,10 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.Extensions.Configuration;
-using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Maui.Handlers;
 using Microsoft.Maui.Hosting.Internal;
-using Microsoft.Maui.HotReload;
 
 namespace Microsoft.Maui.Hosting
 {
@@ -21,6 +19,7 @@ public static partial class AppHostBuilderExtensions
 			{ typeof(IDatePicker), typeof(DatePickerHandler) },
 			{ typeof(IEditor), typeof(EditorHandler) },
 			{ typeof(IEntry), typeof(EntryHandler) },
+			{ typeof(IImage), typeof(ImageHandler) },
 			{ typeof(ILabel), typeof(LabelHandler) },
 			{ typeof(ILayout), typeof(LayoutHandler) },
 			{ typeof(IPicker), typeof(PickerHandler) },
@@ -64,6 +63,13 @@ public static IAppHostBuilder ConfigureServices<TBuilder>(this IAppHostBuilder b
 			return builder;
 		}
 
+		public static IAppHostBuilder ConfigureServices<TBuilder>(this IAppHostBuilder builder)
+			where TBuilder : IMauiServiceBuilder, new()
+		{
+			builder.ConfigureServices<TBuilder>((_, services) => { });
+			return builder;
+		}
+
 		public static IAppHostBuilder ConfigureAppConfiguration(this IAppHostBuilder builder, Action<IConfigurationBuilder> configureDelegate)
 		{
 			builder.ConfigureAppConfiguration((_, config) => configureDelegate(config));
@@ -96,38 +102,7 @@ public static IAppHostBuilder UseMauiServiceProviderFactory(this IAppHostBuilder
 			return builder;
 		}
 
-		public static IAppHostBuilder EnableHotReload(this IAppHostBuilder builder, string? ideIp = null, int idePort = 9988)
-		{
-			builder.ConfigureMauiHandlers((context, handlersCollection) =>
-			{
-				if (handlersCollection is IMauiServiceCollection mauiCollection)
-					MauiHotReloadHelper.Init(mauiCollection);
-				else
-					throw new NotSupportedException("Hot Reload only works with a IMauiServiceCollection");
-			});
-			Reloadify.Reload.Instance.ReplaceType = (d) => {
-				MauiHotReloadHelper.RegisterReplacedView(d.ClassName, d.Type);
-			};
-
-			Reloadify.Reload.Instance.FinishedReload = () => {
-				MauiHotReloadHelper.TriggerReload();
-			};
-			Task.Run(async () =>
-			{
-				try
-				{
-					var success = await Reloadify.Reload.Init(ideIp, idePort);
-					Console.WriteLine($"HotReload Initialize: {success}");
-				}
-				catch(Exception ex)
-				{
-					Console.WriteLine(ex);
-				}
-			});
-			return builder;
-		}
-
-		class HandlerCollectionBuilder : MauiServiceCollection, IMauiHandlersCollection, IMauiServiceBuilder
+		class HandlerCollectionBuilder : MauiHandlersCollection, IMauiServiceBuilder
 		{
 			public void ConfigureServices(HostBuilderContext context, IServiceCollection services)
 			{
diff --git a/src/Core/src/Hosting/Fonts/AppHostBuilderExtensions.cs b/src/Core/src/Hosting/Fonts/AppHostBuilderExtensions.cs
index 6aec30b734ac..3501ad60ce6e 100644
--- a/src/Core/src/Hosting/Fonts/AppHostBuilderExtensions.cs
+++ b/src/Core/src/Hosting/Fonts/AppHostBuilderExtensions.cs
@@ -29,9 +29,9 @@ class FontCollectionBuilder : FontCollection, IMauiServiceBuilder
 		{
 			public void ConfigureServices(HostBuilderContext context, IServiceCollection services)
 			{
-				services.AddSingleton<IEmbeddedFontLoader, EmbeddedFontLoader>();
-				services.AddSingleton<IFontRegistrar>(provider => new FontRegistrar(provider.GetRequiredService<IEmbeddedFontLoader>()));
-				services.AddSingleton<IFontManager>(provider => new FontManager(provider.GetRequiredService<IFontRegistrar>()));
+				services.AddSingleton<IEmbeddedFontLoader>(svc => new EmbeddedFontLoader(svc.CreateLogger<EmbeddedFontLoader>()));
+				services.AddSingleton<IFontRegistrar>(svc => new FontRegistrar(svc.GetRequiredService<IEmbeddedFontLoader>(), svc.CreateLogger<FontRegistrar>()));
+				services.AddSingleton<IFontManager>(svc => new FontManager(svc.GetRequiredService<IFontRegistrar>(), svc.CreateLogger<FontManager>()));
 			}
 
 			public void Configure(HostBuilderContext context, IServiceProvider services)
diff --git a/src/Core/src/Hosting/IMauiHandlersCollection.cs b/src/Core/src/Hosting/IMauiHandlersCollection.cs
index e5418f9514d2..786539c1d341 100644
--- a/src/Core/src/Hosting/IMauiHandlersCollection.cs
+++ b/src/Core/src/Hosting/IMauiHandlersCollection.cs
@@ -2,7 +2,7 @@
 
 namespace Microsoft.Maui.Hosting
 {
-	public interface IMauiHandlersCollection : IServiceCollection
+	public interface IMauiHandlersCollection : IMauiServiceCollection
 	{
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Hosting/IMauiHandlersServiceProvider.cs b/src/Core/src/Hosting/IMauiHandlersServiceProvider.cs
index 133c29ad804b..395afe749c2c 100644
--- a/src/Core/src/Hosting/IMauiHandlersServiceProvider.cs
+++ b/src/Core/src/Hosting/IMauiHandlersServiceProvider.cs
@@ -1,14 +1,17 @@
 #nullable enable
 using System;
+using Microsoft.Maui.Hosting;
 
 namespace Microsoft.Maui
 {
-	public interface IMauiHandlersServiceProvider : IServiceProvider
+	public interface IMauiHandlersServiceProvider : IMauiServiceProvider
 	{
 		Type? GetHandlerType(Type iview);
 
 		IViewHandler? GetHandler(Type type);
 
 		IViewHandler? GetHandler<T>() where T : IView;
+
+		IMauiHandlersCollection GetCollection();
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Hosting/ImageSources/AppHostBuilderExtensions.cs b/src/Core/src/Hosting/ImageSources/AppHostBuilderExtensions.cs
new file mode 100644
index 000000000000..c4ce5f6a854c
--- /dev/null
+++ b/src/Core/src/Hosting/ImageSources/AppHostBuilderExtensions.cs
@@ -0,0 +1,47 @@
+using System;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Maui.Hosting.Internal;
+
+namespace Microsoft.Maui.Hosting
+{
+	public static partial class AppHostBuilderExtensions
+	{
+		public static IAppHostBuilder ConfigureImageSources(this IAppHostBuilder builder)
+		{
+			builder.ConfigureImageSources(services =>
+			{
+				services.AddService<IFileImageSource>(svcs => new FileImageSourceService(svcs.GetService<IImageSourceServiceConfiguration>(), svcs.CreateLogger<FileImageSourceService>()));
+				services.AddService<IFontImageSource>(svcs => new FontImageSourceService(svcs.GetRequiredService<IFontManager>(), svcs.CreateLogger<FontImageSourceService>()));
+				services.AddService<IStreamImageSource>(svcs => new StreamImageSourceService(svcs.CreateLogger<StreamImageSourceService>()));
+				services.AddService<IUriImageSource>(svcs => new UriImageSourceService(svcs.CreateLogger<UriImageSourceService>()));
+			});
+			return builder;
+		}
+
+		public static IAppHostBuilder ConfigureImageSources(this IAppHostBuilder builder, Action<IImageSourceServiceCollection> configureDelegate)
+		{
+			builder.ConfigureServices<ImageSourceServiceBuilder>((_, services) => configureDelegate(services));
+			return builder;
+		}
+
+		public static IAppHostBuilder ConfigureImageSources(this IAppHostBuilder builder, Action<HostBuilderContext, IImageSourceServiceCollection> configureDelegate)
+		{
+			builder.ConfigureServices<ImageSourceServiceBuilder>(configureDelegate);
+			return builder;
+		}
+
+		class ImageSourceServiceBuilder : MauiServiceCollection, IImageSourceServiceCollection, IMauiServiceBuilder
+		{
+			public void ConfigureServices(HostBuilderContext context, IServiceCollection services)
+			{
+				services.AddSingleton<IImageSourceServiceConfiguration, ImageSourceServiceConfiguration>();
+				services.AddSingleton<IImageSourceServiceProvider>(svcs => new ImageSourceServiceProvider(this, svcs));
+			}
+
+			public void Configure(HostBuilderContext context, IServiceProvider services)
+			{
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Hosting/ImageSources/IImageSourceServiceCollection.cs b/src/Core/src/Hosting/ImageSources/IImageSourceServiceCollection.cs
new file mode 100644
index 000000000000..d1d62e3ebd73
--- /dev/null
+++ b/src/Core/src/Hosting/ImageSources/IImageSourceServiceCollection.cs
@@ -0,0 +1,8 @@
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.Maui.Hosting
+{
+	public interface IImageSourceServiceCollection : IServiceCollection
+	{
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Hosting/ImageSources/IImageSourceServiceProvider.cs b/src/Core/src/Hosting/ImageSources/IImageSourceServiceProvider.cs
new file mode 100644
index 000000000000..07da21ccf637
--- /dev/null
+++ b/src/Core/src/Hosting/ImageSources/IImageSourceServiceProvider.cs
@@ -0,0 +1,17 @@
+#nullable enable
+
+using System;
+
+namespace Microsoft.Maui
+{
+	public interface IImageSourceServiceProvider : IServiceProvider
+	{
+		IServiceProvider HostServiceProvider { get; }
+
+		IImageSourceService? GetImageSourceService(Type imageSource);
+
+		Type GetImageSourceServiceType(Type imageSource);
+
+		Type GetImageSourceType(Type imageSource);
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Hosting/ImageSources/ImageSourceServiceCollectionExtensions.cs b/src/Core/src/Hosting/ImageSources/ImageSourceServiceCollectionExtensions.cs
new file mode 100644
index 000000000000..908451d9183d
--- /dev/null
+++ b/src/Core/src/Hosting/ImageSources/ImageSourceServiceCollectionExtensions.cs
@@ -0,0 +1,25 @@
+using System;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Microsoft.Maui.Hosting
+{
+	public static class ImageSourceServiceCollectionExtensions
+	{
+		public static IImageSourceServiceCollection AddService<TImageSource, TImageSourceService>(this IImageSourceServiceCollection services)
+			where TImageSource : IImageSource
+			where TImageSourceService : class, IImageSourceService<TImageSource>
+		{
+			services.AddSingleton<IImageSourceService<TImageSource>, TImageSourceService>();
+
+			return services;
+		}
+
+		public static IImageSourceServiceCollection AddService<TImageSource>(this IImageSourceServiceCollection services, Func<IServiceProvider, IImageSourceService<TImageSource>> implementationFactory)
+			where TImageSource : IImageSource
+		{
+			services.AddSingleton(provider => implementationFactory(((IImageSourceServiceProvider)provider).HostServiceProvider));
+
+			return services;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Hosting/ImageSources/ImageSourceServiceProvider.cs b/src/Core/src/Hosting/ImageSources/ImageSourceServiceProvider.cs
new file mode 100644
index 000000000000..1246ce628f50
--- /dev/null
+++ b/src/Core/src/Hosting/ImageSources/ImageSourceServiceProvider.cs
@@ -0,0 +1,53 @@
+#nullable enable
+
+using System;
+using System.Collections.Concurrent;
+using Microsoft.Maui.Hosting.Internal;
+
+namespace Microsoft.Maui.Hosting
+{
+	class ImageSourceServiceProvider : MauiServiceProvider, IImageSourceServiceProvider
+	{
+		static readonly string ImageSourceInterface = typeof(IImageSource).FullName!;
+		static readonly Type ImageSourceServiceType = typeof(IImageSourceService<>);
+
+		readonly ConcurrentDictionary<Type, Type> _imageSourceCache = new ConcurrentDictionary<Type, Type>();
+		readonly ConcurrentDictionary<Type, Type> _serviceCache = new ConcurrentDictionary<Type, Type>();
+
+		public ImageSourceServiceProvider(IMauiServiceCollection collection, IServiceProvider hostServiceProvider)
+			: base(collection, false)
+		{
+			HostServiceProvider = hostServiceProvider;
+		}
+
+		public IServiceProvider HostServiceProvider { get; }
+
+		public IImageSourceService? GetImageSourceService(Type imageSource) =>
+			(IImageSourceService?)GetService(GetImageSourceServiceType(imageSource));
+
+		public Type GetImageSourceServiceType(Type imageSource) =>
+			_serviceCache.GetOrAdd(imageSource, type => ImageSourceServiceType.MakeGenericType(GetImageSourceType(type)));
+
+		public Type GetImageSourceType(Type imageSource) =>
+			_imageSourceCache.GetOrAdd(imageSource, CreateImageSourceTypeCacheEntry);
+
+		Type CreateImageSourceTypeCacheEntry(Type type)
+		{
+			if (type.IsInterface)
+			{
+				if (type.GetInterface(ImageSourceInterface) != null)
+					return type;
+			}
+			else
+			{
+				foreach (var directInterface in type.GetInterfaces())
+				{
+					if (directInterface.GetInterface(ImageSourceInterface) != null)
+						return directInterface;
+				}
+			}
+
+			throw new InvalidOperationException($"Unable to find the image source type because none of the interfaces on {type.Name} were derived from {nameof(IImageSource)}.");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Hosting/ImageSources/ImageSourceServiceProviderExtensions.cs b/src/Core/src/Hosting/ImageSources/ImageSourceServiceProviderExtensions.cs
new file mode 100644
index 000000000000..1e3e240d5d76
--- /dev/null
+++ b/src/Core/src/Hosting/ImageSources/ImageSourceServiceProviderExtensions.cs
@@ -0,0 +1,32 @@
+#nullable enable
+
+using System;
+
+namespace Microsoft.Maui
+{
+	public static class ImageSourceServiceProviderExtensions
+	{
+		public static IImageSourceService? GetImageSourceService(this IImageSourceServiceProvider provider, IImageSource imageSource) =>
+			provider.GetImageSourceService(imageSource.GetType());
+
+		public static IImageSourceService? GetImageSourceService<T>(this IImageSourceServiceProvider provider)
+			where T : IImageSource =>
+			provider.GetImageSourceService(typeof(T));
+
+		public static IImageSourceService GetRequiredImageSourceService(this IImageSourceServiceProvider provider, IImageSource imageSource) =>
+			provider.GetRequiredImageSourceService(imageSource.GetType());
+
+		public static IImageSourceService GetRequiredImageSourceService<T>(this IImageSourceServiceProvider provider)
+			where T : IImageSource =>
+			provider.GetRequiredImageSourceService(typeof(T));
+
+		public static IImageSourceService GetRequiredImageSourceService(this IImageSourceServiceProvider provider, Type imageSourceType)
+		{
+			var service = provider.GetImageSourceService(imageSourceType);
+			if (service != null)
+				return service;
+
+			throw new InvalidOperationException($"Unable to find a image source service for {provider.GetImageSourceType(imageSourceType)}.");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Hosting/Internal/FallbackLogging.cs b/src/Core/src/Hosting/Internal/FallbackLogging.cs
new file mode 100644
index 000000000000..99b3f33abeff
--- /dev/null
+++ b/src/Core/src/Hosting/Internal/FallbackLogging.cs
@@ -0,0 +1,60 @@
+#nullable enable
+
+using System;
+using System.Diagnostics;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.Maui.Hosting.Internal
+{
+	class FallbackLoggerFactory : ILoggerFactory
+	{
+		public void AddProvider(ILoggerProvider provider) { }
+
+		public ILogger CreateLogger(string categoryName) =>
+			new FallbackLogger(categoryName);
+
+		public void Dispose() { }
+
+		class FallbackLogger : ILogger
+		{
+			private string _categoryName;
+
+			public FallbackLogger(string categoryName)
+			{
+				_categoryName = categoryName;
+			}
+
+			public IDisposable BeginScope<TState>(TState state) =>
+				FallbackScope.Instance;
+
+			public bool IsEnabled(LogLevel logLevel) =>
+				Debugger.IsAttached && logLevel != LogLevel.None;
+
+			public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func<TState, Exception?, string> formatter)
+			{
+				if (!IsEnabled(logLevel))
+					return;
+
+				if (formatter == null)
+					throw new ArgumentNullException(nameof(formatter));
+
+				var message = formatter(state, exception);
+				if (string.IsNullOrEmpty(message))
+					return;
+
+				message = $"{ logLevel }: {message}";
+				if (exception != null)
+					message += Environment.NewLine + Environment.NewLine + exception;
+
+				Debug.WriteLine(message, category: _categoryName);
+			}
+		}
+
+		class FallbackScope : IDisposable
+		{
+			public static FallbackScope Instance { get; } = new FallbackScope();
+
+			public void Dispose() { }
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Hosting/Internal/MauiHandlersCollection.cs b/src/Core/src/Hosting/Internal/MauiHandlersCollection.cs
new file mode 100644
index 000000000000..f586c773dc1d
--- /dev/null
+++ b/src/Core/src/Hosting/Internal/MauiHandlersCollection.cs
@@ -0,0 +1,8 @@
+#nullable enable
+
+namespace Microsoft.Maui.Hosting.Internal
+{
+	class MauiHandlersCollection : MauiServiceCollection, IMauiHandlersCollection
+	{
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Hosting/Internal/MauiHandlersServiceProvider.cs b/src/Core/src/Hosting/Internal/MauiHandlersServiceProvider.cs
index 4236b7382807..5831d1d9ff02 100644
--- a/src/Core/src/Hosting/Internal/MauiHandlersServiceProvider.cs
+++ b/src/Core/src/Hosting/Internal/MauiHandlersServiceProvider.cs
@@ -5,9 +5,12 @@ namespace Microsoft.Maui.Hosting.Internal
 {
 	class MauiHandlersServiceProvider : MauiServiceProvider, IMauiHandlersServiceProvider
 	{
-		public MauiHandlersServiceProvider(IMauiServiceCollection collection)
+		readonly IMauiHandlersCollection _collection;
+
+		public MauiHandlersServiceProvider(IMauiHandlersCollection collection)
 			: base(collection, false)
 		{
+			_collection = collection;
 		}
 
 		public IViewHandler? GetHandler(Type type)
@@ -16,6 +19,15 @@ public MauiHandlersServiceProvider(IMauiServiceCollection collection)
 		public IViewHandler? GetHandler<T>() where T : IView
 			=> GetHandler(typeof(T));
 
-		public Type? GetHandlerType(Type iview) => GetServiceType(iview)?.ImplementationType;
+		public Type? GetHandlerType(Type iview)
+		{
+			foreach (var descriptor in GetServiceDescriptors(iview))
+			{
+				return descriptor.ImplementationType;
+			}
+			return null;
+		}
+
+		public IMauiHandlersCollection GetCollection() => _collection;
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Hosting/Internal/MauiServiceProvider.cs b/src/Core/src/Hosting/Internal/MauiServiceProvider.cs
index 0a374679e624..da04ad2979f6 100644
--- a/src/Core/src/Hosting/Internal/MauiServiceProvider.cs
+++ b/src/Core/src/Hosting/Internal/MauiServiceProvider.cs
@@ -1,5 +1,6 @@
 #nullable enable
 using System;
+using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Reflection;
@@ -10,6 +11,8 @@ namespace Microsoft.Maui.Hosting.Internal
 	class MauiServiceProvider : IMauiServiceProvider
 	{
 		static readonly Type ServiceProviderType = typeof(IServiceProvider);
+		static readonly Type EnumerableType = typeof(IEnumerable<>);
+		static readonly Type ListType = typeof(List<>);
 
 		readonly IMauiServiceCollection _collection;
 		readonly bool _constructorInjection;
@@ -22,13 +25,84 @@ public MauiServiceProvider(IMauiServiceCollection collection, bool constructorIn
 			_collection = collection ?? throw new ArgumentNullException(nameof(collection));
 			_constructorInjection = constructorInjection;
 			_singletons = new ConcurrentDictionary<ServiceDescriptor, object?>();
+
+			// to make things easier, just add the provider
+			collection.AddSingleton<IServiceProvider>(this);
 		}
-		public ServiceDescriptor? GetServiceType(Type serviceType)
+
+		public object? GetService(Type serviceType)
+		{
+			if (!TryGetServiceDescriptors(ref serviceType, out var single, out var enumerable))
+				return default;
+
+			return GetService(serviceType, single, enumerable);
+		}
+
+		protected ServiceDescriptor? GetServiceDescriptor(Type serviceType)
 		{
 			if (serviceType == null)
 				throw new ArgumentNullException(nameof(serviceType));
 
-			List<Type> types = new List<Type> { serviceType };
+			var types = GetServiceBaseTypes(serviceType);
+
+			foreach (var type in types)
+			{
+				if (_collection.TryGetService(type, out var descriptor) && descriptor != null)
+					return descriptor;
+			}
+
+			return null;
+		}
+
+		protected IEnumerable<ServiceDescriptor> GetServiceDescriptors(Type serviceType)
+		{
+			if (serviceType == null)
+				throw new ArgumentNullException(nameof(serviceType));
+
+			var types = GetServiceBaseTypes(serviceType);
+
+			foreach (var type in types)
+			{
+				foreach (var descriptor in _collection)
+				{
+					if (descriptor.ServiceType == serviceType)
+						yield return descriptor;
+				}
+			}
+		}
+
+		bool TryGetServiceDescriptors(ref Type serviceType, out ServiceDescriptor? single, out IEnumerable<ServiceDescriptor>? enumerable)
+		{
+			// fast path for exact match
+			{
+				var descriptor = GetServiceDescriptor(serviceType);
+				if (descriptor != null)
+				{
+					single = descriptor;
+					enumerable = null;
+					return true;
+				}
+			}
+
+			// try match IEnumerable<TServiceType>
+			if (serviceType.IsGenericType && serviceType.GetGenericTypeDefinition() == EnumerableType)
+			{
+				serviceType = serviceType.GenericTypeArguments[0];
+				var descriptors = GetServiceDescriptors(serviceType);
+
+				single = null;
+				enumerable = descriptors;
+				return true;
+			}
+
+			single = null;
+			enumerable = null;
+			return false;
+		}
+
+		static List<Type> GetServiceBaseTypes(Type serviceType)
+		{
+			var types = new List<Type> { serviceType };
 
 			Type? baseType = serviceType.BaseType;
 
@@ -44,31 +118,18 @@ public MauiServiceProvider(IMauiServiceCollection collection, bool constructorIn
 					types.Add(interfac);
 			}
 
-			foreach (var type in types)
-			{
-				if (_collection.TryGetService(type, out var descriptor))
-				{
-					
-					return descriptor;
-				}
-			}
-
-			return default!;
+			return types;
 		}
 
-		public object? GetService(Type serviceType)
+		object? GetService(ServiceDescriptor descriptor)
 		{
-			var descriptor = GetServiceType(serviceType);
-			if(descriptor == null)
-				return default!;
-
 			if (descriptor!.Lifetime == ServiceLifetime.Singleton)
-			{ 
+			{
 				if (_singletons.TryGetValue(descriptor, out var singletonInstance))
 					return singletonInstance;
 			}
-			var typeInstance = CreateInstance(descriptor);
 
+			var typeInstance = CreateInstance(descriptor);
 			if (descriptor.Lifetime == ServiceLifetime.Singleton)
 			{
 				_singletons[descriptor] = typeInstance;
@@ -76,6 +137,26 @@ public MauiServiceProvider(IMauiServiceCollection collection, bool constructorIn
 			return typeInstance;
 		}
 
+		object? GetService(Type serviceType, ServiceDescriptor? single, IEnumerable<ServiceDescriptor>? enumerable)
+		{
+			if (single != null)
+				return GetService(single);
+
+			if (enumerable != null)
+			{
+				var values = (IList)Activator.CreateInstance(ListType.MakeGenericType(serviceType))!;
+
+				foreach (var descriptor in enumerable)
+				{
+					values.Add(GetService(descriptor));
+				}
+
+				if (values.Count > 0)
+					return values;
+			}
+			return default;
+		}
+
 		object? CreateInstance(ServiceDescriptor item)
 		{
 			if (item.ImplementationType != null)
@@ -97,52 +178,77 @@ public MauiServiceProvider(IMauiServiceCollection collection, bool constructorIn
 
 		object? CreateInstance(Type implementationType)
 		{
-			(ConstructorInfo Constructor, ParameterInfo[] Parameters) match = default;
+			// get constructors ordered by parameter count
 			var constructors = implementationType.GetConstructors(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
+			var matches = new (ConstructorInfo? Constructor, ParameterInfo[]? Parameters)[constructors.Length];
+			var matchesCounts = new int[constructors.Length];
+			var found = false;
 			for (var i = 0; i < constructors.Length; i++)
 			{
 				var ctor = constructors[i];
 				if (!ctor.IsFamily && !ctor.IsPrivate)
 				{
 					var parameters = ctor.GetParameters();
-					if (match.Parameters == null || parameters.Length > match.Parameters.Length)
-						match = (ctor, parameters);
+					matchesCounts[i] = parameters.Length;
+					matches[i] = (ctor, parameters);
+					found = true;
 				}
 			}
+			Array.Sort(matchesCounts, matches);
 
-			if (match.Constructor == null)
+			if (!found)
 				throw new InvalidOperationException($"The type '{implementationType.Name}' did not have any public or internal constructors.");
 
-			var paramCount = match.Parameters!.Length;
-
-			if (paramCount == 0)
-				return match.Constructor.Invoke(null);
-
-			var paramValues = new object?[paramCount];
-
-			for (var i = 0; i < paramCount; i++)
+			// go through in reverse order
+			for (var m = matches.Length - 1; m >= 0; m--)
 			{
-				var param = match.Parameters[i];
-				var value = GetServiceCore(param.ParameterType);
-				if (value == null)
+				var (constructor, parameters) = matches[m];
+				if (constructor != null && parameters != null)
 				{
-					if (!param.HasDefaultValue)
-						throw new InvalidOperationException($"No service for type '{param.ParameterType}' has been registered.");
-					else
-						value = param.DefaultValue;
+					var paramCount = parameters.Length;
+
+					// we are at a ctor that has no params, so just use that
+					if (paramCount == 0)
+						return constructor.Invoke(null);
+
+					// try find a ctor that matches what we have in the service collection
+					var validConstructor = true;
+					var paramDescriptors = new (Type ServiceType, ServiceDescriptor? Single, IEnumerable<ServiceDescriptor>? Enumerable, object? Value)[paramCount];
+					for (var i = 0; i < paramCount; i++)
+					{
+						var param = parameters[i];
+						var paramType = param.ParameterType;
+
+						var isValid = TryGetServiceDescriptors(ref paramType, out var single, out var enumerable);
+						if (isValid)
+							paramDescriptors[i] = (paramType, single, enumerable, null);
+						else if (param.HasDefaultValue)
+							paramDescriptors[i] = (paramType, null, null, param.DefaultValue);
+						else
+						{
+							validConstructor = false;
+							break;
+						}
+					}
+
+					// we found something, so now inflate
+					if (validConstructor)
+					{
+						var paramValues = new object?[paramCount];
+						for (var i = 0; i < paramCount; i++)
+						{
+							var descriptor = paramDescriptors[i];
+							if (descriptor.Single != null || descriptor.Enumerable != null)
+								paramValues[i] = GetService(descriptor.ServiceType, descriptor.Single, descriptor.Enumerable);
+							else
+								paramValues[i] = descriptor.Value;
+						}
+						return constructor.Invoke(paramValues);
+					}
 				}
-				paramValues[i] = value;
 			}
 
-			return match.Constructor.Invoke(paramValues);
-		}
-
-		object? GetServiceCore(Type type)
-		{
-			if (ServiceProviderType.IsAssignableFrom(type))
-				return this;
-
-			return GetService(type);
+			throw new InvalidOperationException($"Could not match any constructors for '{implementationType.Name}'.");
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Hosting/MauiHandlersCollectionExtensions.cs b/src/Core/src/Hosting/MauiHandlersCollectionExtensions.cs
index 8c2842b8588d..c75df282f9dc 100644
--- a/src/Core/src/Hosting/MauiHandlersCollectionExtensions.cs
+++ b/src/Core/src/Hosting/MauiHandlersCollectionExtensions.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 
 namespace Microsoft.Maui.Hosting
 {
@@ -28,5 +29,28 @@ public static IMauiHandlersCollection AddHandler<TType, TTypeRender>(this IMauiH
 			handlersCollection.AddTransient(typeof(TType), typeof(TTypeRender));
 			return handlersCollection;
 		}
+
+		public static IMauiHandlersCollection TryAddHandlers(this IMauiHandlersCollection handlersCollection, Dictionary<Type, Type> handlers)
+		{
+			foreach (var handler in handlers)
+			{
+				handlersCollection.TryAddTransient(handler.Key, handler.Value);
+			}
+			return handlersCollection;
+		}
+
+		public static IMauiHandlersCollection TryAddHandler(this IMauiHandlersCollection handlersCollection, Type viewType, Type handlerType)
+		{
+			handlersCollection.AddTransient(viewType, handlerType);
+			return handlersCollection;
+		}
+
+		public static IMauiHandlersCollection TryAddHandler<TType, TTypeRender>(this IMauiHandlersCollection handlersCollection)
+			where TType : IFrameworkElement
+			where TTypeRender : IViewHandler
+		{
+			handlersCollection.AddTransient(typeof(TType), typeof(TTypeRender));
+			return handlersCollection;
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Hosting/ServiceProviderExtensions.cs b/src/Core/src/Hosting/ServiceProviderExtensions.cs
new file mode 100644
index 000000000000..e3b7fd63c807
--- /dev/null
+++ b/src/Core/src/Hosting/ServiceProviderExtensions.cs
@@ -0,0 +1,13 @@
+#nullable enable
+using System;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.Maui
+{
+	public static class ServiceProviderExtensions
+	{
+		internal static ILogger<T>? CreateLogger<T>(this IServiceProvider services) =>
+			services.GetService<ILoggerFactory>()?.CreateLogger<T>();
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Hosting/StartupExtensions.cs b/src/Core/src/Hosting/StartupExtensions.cs
index 1343aa3ae03d..d4b70a669bca 100644
--- a/src/Core/src/Hosting/StartupExtensions.cs
+++ b/src/Core/src/Hosting/StartupExtensions.cs
@@ -7,7 +7,7 @@ public static IAppHostBuilder CreateAppHostBuilder(this IStartup startup)
 			if (startup is IAppHostBuilderStartup hostBuilderStartup)
 				return hostBuilderStartup.CreateAppHostBuilder();
 
-			return AppHostBuilder.CreateDefaultAppBuilder();
+			return AppHost.CreateDefaultBuilder();
 		}
 
 		public static IAppHostBuilder ConfigureUsing(this IAppHostBuilder appHostBuilder, IStartup startup)
diff --git a/src/Core/src/HotReload/AppHostBuilderExtensions.cs b/src/Core/src/HotReload/AppHostBuilderExtensions.cs
new file mode 100644
index 000000000000..7c1d786964ff
--- /dev/null
+++ b/src/Core/src/HotReload/AppHostBuilderExtensions.cs
@@ -0,0 +1,64 @@
+#nullable enable
+using System;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Maui.HotReload;
+
+namespace Microsoft.Maui.Hosting
+{
+	public static partial class AppHostBuilderExtensions
+	{
+		public static IAppHostBuilder EnableHotReload(this IAppHostBuilder builder, string? ideIp = null, int idePort = 9988)
+		{
+			builder.ConfigureServices<HotReloadBuilder>(hotReload =>
+			{
+				hotReload.IdeIp = ideIp;
+				hotReload.IdePort = idePort;
+			});
+			return builder;
+		}
+
+		class HotReloadBuilder : IMauiServiceBuilder
+		{
+			public string? IdeIp { get; set; }
+
+			public int IdePort { get; set; } = 9988;
+
+			public void ConfigureServices(HostBuilderContext context, IServiceCollection services)
+			{
+			}
+
+			public async void Configure(HostBuilderContext context, IServiceProvider services)
+			{
+				var handlers = services.GetRequiredService<IMauiHandlersServiceProvider>();
+
+				MauiHotReloadHelper.Init(handlers.GetCollection());
+
+				Reloadify.Reload.Instance.ReplaceType = (d) =>
+				{
+					MauiHotReloadHelper.RegisterReplacedView(d.ClassName, d.Type);
+				};
+
+				Reloadify.Reload.Instance.FinishedReload = () =>
+				{
+					MauiHotReloadHelper.TriggerReload();
+				};
+
+				await Task.Run(async () =>
+				{
+					try
+					{
+						var success = await Reloadify.Reload.Init(IdeIp, IdePort);
+
+						Console.WriteLine($"HotReload Initialize: {success}");
+					}
+					catch (Exception ex)
+					{
+						Console.WriteLine(ex);
+					}
+				});
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/HotReload/HotReloadExtensions.cs b/src/Core/src/HotReload/HotReloadExtensions.cs
index 81caea74252f..2a3bd420df49 100644
--- a/src/Core/src/HotReload/HotReloadExtensions.cs
+++ b/src/Core/src/HotReload/HotReloadExtensions.cs
@@ -1,5 +1,8 @@
 #nullable enable
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
 using Microsoft.Maui.Hosting;
 
 namespace Microsoft.Maui.HotReload
@@ -31,5 +34,28 @@ public static void CheckHandlers(this IView view)
 			}
 		}
 
+		public static List<MethodInfo> GetOnHotReloadMethods(this Type type) => getOnHotReloadMethods(type).Distinct(new ReflectionMethodComparer()).ToList();
+
+		static IEnumerable<MethodInfo> getOnHotReloadMethods(Type type, bool isSubclass = false)
+		{
+			var flags = BindingFlags.Static | BindingFlags.FlattenHierarchy | BindingFlags.Public | BindingFlags.NonPublic;
+			if (isSubclass)
+				flags = BindingFlags.Static | BindingFlags.NonPublic;
+			var foos = type.GetMethods(flags).Where(x => x.GetCustomAttributes(typeof(OnHotReloadAttribute), true).Any()).ToList();
+			foreach (var foo in foos)
+				yield return foo;
+
+			if (type.BaseType != null)
+				foreach (var foo in getOnHotReloadMethods(type.BaseType, true))
+					yield return foo;
+		}
+
+		class ReflectionMethodComparer : IEqualityComparer<MethodInfo>
+		{
+			public bool Equals(MethodInfo? g1, MethodInfo? g2) => g1?.MethodHandle == g2?.MethodHandle;
+
+			public int GetHashCode(MethodInfo obj) => obj.MethodHandle.GetHashCode();
+		}
+
 	}
 }
diff --git a/src/Core/src/HotReload/HotReloadHelper.cs b/src/Core/src/HotReload/HotReloadHelper.cs
index ffe678ad5586..e6bb9390487a 100644
--- a/src/Core/src/HotReload/HotReloadHelper.cs
+++ b/src/Core/src/HotReload/HotReloadHelper.cs
@@ -11,9 +11,9 @@ namespace Microsoft.Maui.HotReload
 {
 	public static class MauiHotReloadHelper
 	{
-		static IMauiServiceCollection? HandlerService;
+		static IMauiHandlersCollection? HandlerService;
 		//static IMauiHandlersServiceProvider? HandlerServiceProvider;
-		public static void Init(IMauiServiceCollection handlerService)
+		public static void Init(IMauiHandlersCollection handlerService)
 		{
 			HandlerService = handlerService;
 			//HandlerServiceProvider = new MauiHandlersServiceProvider(handlerService);
@@ -98,7 +98,22 @@ public static void RegisterReplacedView(string oldViewType, Type newViewType)
 			if (!IsEnabled)
 				return;
 
-			Console.WriteLine($"{oldViewType} - {newViewType}");
+			Action<MethodInfo> executeStaticMethod = (method) =>
+			{
+				try
+				{
+					method?.Invoke(null, null);
+				}
+				catch (Exception ex)
+				{
+					Debug.WriteLine($"Error calling {method.Name} on type: {newViewType}");
+					Debug.WriteLine(ex);
+					//TODO: Notifiy that we couldnt execute OnHotReload for the Method;
+				}
+			};
+
+			var onHotReloadMethods = newViewType.GetOnHotReloadMethods();
+			onHotReloadMethods.ForEach(x => executeStaticMethod(x));
 
 			if (typeof(IHotReloadableView).IsAssignableFrom(newViewType))
 				replacedViews[oldViewType] = newViewType;
@@ -116,7 +131,7 @@ public static void RegisterReplacedView(string oldViewType, Type newViewType)
 				var assemblies = AppDomain.CurrentDomain.GetAssemblies();
 				var t = assemblies.Select(x => x.GetType(oldViewType)).FirstOrDefault(x => x != null);
 
-				var views = HandlerService!.Where(x => x.ImplementationType == t).Select(x => new KeyValuePair<Type,Type>(x.ServiceType, x.ImplementationType!)).ToList();
+				var views = HandlerService!.Where(x => x.ImplementationType == t).Select(x => new KeyValuePair<Type, Type>(x.ServiceType, x.ImplementationType!)).ToList();
 
 
 				replacedHandlers[oldViewType] = views.ToList();
@@ -125,17 +140,7 @@ public static void RegisterReplacedView(string oldViewType, Type newViewType)
 					RegisterHandler(h, newViewType);
 				}
 			}
-			try{
-			//Call static init if it exists on new classes!
-				var staticInit = newViewType.GetMethod("Init", BindingFlags.Static | BindingFlags.Public);
-				staticInit?.Invoke(null, null);
-			}
-			catch(Exception ex){
 
-				Debug.WriteLine($"Error calling Init on type: {newViewType}");
-				Debug.WriteLine(ex);
-				//TODO: Notifiy that we couldnt hot reload.
-			}
 		}
 
 
@@ -146,7 +151,7 @@ static void RegisterHandler(KeyValuePair<Type, Type> pair, Type newHandler)
 			var newType = newHandler;
 			if (pair.Value.IsGenericType)
 				newType = pair.Value.GetGenericTypeDefinition().MakeGenericType(newHandler);
-			HandlerService.AddTransient(view, newType);
+			HandlerService.AddHandler(view, newType);
 		}
 
 		public static void TriggerReload()
diff --git a/src/Core/src/HotReload/OnHotReloadAttribute.cs b/src/Core/src/HotReload/OnHotReloadAttribute.cs
new file mode 100644
index 000000000000..d143fb36a57c
--- /dev/null
+++ b/src/Core/src/HotReload/OnHotReloadAttribute.cs
@@ -0,0 +1,9 @@
+using System;
+namespace Microsoft.Maui.HotReload
+{
+	[AttributeUsage(AttributeTargets.Method)]
+	public class OnHotReloadAttribute : Attribute
+	{
+
+	}
+}
diff --git a/src/Core/src/HotReload/WeakList.cs b/src/Core/src/HotReload/WeakList.cs
index 357975834b0f..1d222aef77d3 100644
--- a/src/Core/src/HotReload/WeakList.cs
+++ b/src/Core/src/HotReload/WeakList.cs
@@ -14,7 +14,8 @@ internal class WeakList<T> : IList<T?>
 
 		public bool IsReadOnly => false;
 
-		public void Add(T? item) {
+		public void Add(T? item)
+		{
 			if (item == null)
 				return;
 			if (Contains(item))
diff --git a/src/Core/src/IApplication.cs b/src/Core/src/IApplication.cs
index f6910fce34da..31a7447020fb 100644
--- a/src/Core/src/IApplication.cs
+++ b/src/Core/src/IApplication.cs
@@ -1,7 +1,10 @@
+using System.Collections.Generic;
+
 namespace Microsoft.Maui
 {
 	public interface IApplication
 	{
+		IReadOnlyList<IWindow> Windows { get; }
 		IWindow CreateWindow(IActivationState activationState);
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/ImageSources/Android/Glide/FontImageSourceDecoder.cs b/src/Core/src/ImageSources/Android/Glide/FontImageSourceDecoder.cs
new file mode 100644
index 000000000000..a35c2098d705
--- /dev/null
+++ b/src/Core/src/ImageSources/Android/Glide/FontImageSourceDecoder.cs
@@ -0,0 +1,27 @@
+#nullable enable
+using Bumptech.Glide.Load;
+using Bumptech.Glide.Load.Engine;
+using Bumptech.Glide.Load.Engine.BitmapRecycle;
+using Bumptech.Glide.Load.Resource.Bitmap;
+
+namespace Microsoft.Maui.BumptechGlide
+{
+	// TODO: make this public and do it better
+	class FontImageSourceDecoder : Java.Lang.Object, IResourceDecoder
+	{
+		readonly IBitmapPool _bitmapPool = new BitmapPoolAdapter();
+
+		public bool Handles(Java.Lang.Object model, Options options) =>
+			model is FontImageSourceModel;
+
+		public IResource Decode(Java.Lang.Object model, int width, int height, Options options)
+		{
+			var source = (FontImageSourceModel)model;
+
+			// TODO: do not use the static here, make the service extensible so that it can be overridden
+			var bitmap = FontImageSourceService.RenderBitmap(source, (w, h, c) => _bitmapPool.Get(w, h, c));
+
+			return new BitmapResource(bitmap, _bitmapPool);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/ImageSources/Android/Glide/FontImageSourceModel.cs b/src/Core/src/ImageSources/Android/Glide/FontImageSourceModel.cs
new file mode 100644
index 000000000000..c7b5a52105d8
--- /dev/null
+++ b/src/Core/src/ImageSources/Android/Glide/FontImageSourceModel.cs
@@ -0,0 +1,28 @@
+#nullable enable
+using Android.Graphics;
+
+namespace Microsoft.Maui.BumptechGlide
+{
+	// TODO: make this public and do it better
+	class FontImageSourceModel : Java.Lang.Object, FontImageSourceService.IModel
+	{
+		public FontImageSourceModel(string glyph, float textSize, Typeface? typeface, Color color)
+		{
+			Glyph = glyph;
+			TextSize = textSize;
+			Typeface = typeface;
+			Color = color;
+		}
+
+		public string Glyph { get; }
+
+		public float TextSize { get; }
+
+		public Typeface? Typeface { get; }
+
+		public Color Color { get; }
+
+		public override string ToString() =>
+			$"FontImageSourceModel{{Glyph={Glyph}, TextSize={TextSize}, Typeface={Typeface}, Color={Color}}}";
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/ImageSources/Android/Glide/MauiAppGlideModule.cs b/src/Core/src/ImageSources/Android/Glide/MauiAppGlideModule.cs
new file mode 100644
index 000000000000..f480096cee3d
--- /dev/null
+++ b/src/Core/src/ImageSources/Android/Glide/MauiAppGlideModule.cs
@@ -0,0 +1,32 @@
+#nullable enable
+using System;
+using System.Collections.Generic;
+using Android.Content;
+using Android.Graphics;
+using Android.Runtime;
+using Bumptech.Glide;
+using Java.IO;
+
+namespace Microsoft.Maui.BumptechGlide
+{
+	// This class name is very specific as it is directly loaded.
+	// TODO: make this extensible
+	[Register("com.bumptech.glide.GeneratedAppGlideModuleImpl")]
+	public class MauiAppGlideModule : GeneratedAppGlideModule
+	{
+		public MauiAppGlideModule(Context context)
+		{
+		}
+
+		public override void RegisterComponents(Context context, Glide glide, Registry registry) => registry
+			.Prepend(GetClass<InputStream>(), GetClass<InputStream>(), new PassThroughModelLoader<InputStream>.Factory())
+			.Append(GetClass<FontImageSourceModel>(), GetClass<FontImageSourceModel>(), new PassThroughModelLoader<FontImageSourceModel>.Factory())
+			.Append(GetClass<FontImageSourceModel>(), GetClass<Bitmap>(), new FontImageSourceDecoder());
+
+		public override ICollection<Java.Lang.Class> ExcludedModuleClasses =>
+			Array.Empty<Java.Lang.Class>();
+
+		static Java.Lang.Class GetClass<T>() =>
+			Java.Lang.Class.FromType(typeof(T));
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/ImageSources/Android/Glide/PassThroughModelLoader.cs b/src/Core/src/ImageSources/Android/Glide/PassThroughModelLoader.cs
new file mode 100644
index 000000000000..8c3d314aa944
--- /dev/null
+++ b/src/Core/src/ImageSources/Android/Glide/PassThroughModelLoader.cs
@@ -0,0 +1,50 @@
+#nullable enable
+using Bumptech.Glide;
+using Bumptech.Glide.Load;
+using Bumptech.Glide.Load.Data;
+using Bumptech.Glide.Load.Model;
+using Bumptech.Glide.Signature;
+
+namespace Microsoft.Maui.BumptechGlide
+{
+	public class PassThroughModelLoader<T> : Java.Lang.Object, IModelLoader
+	{
+		public ModelLoaderLoadData BuildLoadData(Java.Lang.Object model, int width, int height, Options options) =>
+			new ModelLoaderLoadData(new ObjectKey(model.ToString()), new DataFetcher(model));
+
+		public bool Handles(Java.Lang.Object model) =>
+			model is T;
+
+		public class DataFetcher : Java.Lang.Object, IDataFetcher
+		{
+			readonly Java.Lang.Object _model;
+
+			public DataFetcher(Java.Lang.Object model)
+			{
+				_model = model;
+			}
+
+			public Java.Lang.Class DataClass =>
+				Java.Lang.Class.FromType(typeof(T));
+
+			public DataSource DataSource =>
+				DataSource.Local;
+
+			public void Cancel() { }
+
+			public void Cleanup() =>
+				_model?.Dispose();
+
+			public void LoadData(Priority priority, IDataFetcherDataCallback callback) =>
+				callback.OnDataReady(_model);
+		}
+
+		public class Factory : Java.Lang.Object, IModelLoaderFactory
+		{
+			public IModelLoader Build(MultiModelLoaderFactory factory) =>
+				new PassThroughModelLoader<T>();
+
+			public void Teardown() { }
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/ImageSources/Android/Glide/RequestBuilderExtensions.cs b/src/Core/src/ImageSources/Android/Glide/RequestBuilderExtensions.cs
new file mode 100644
index 000000000000..03310620614c
--- /dev/null
+++ b/src/Core/src/ImageSources/Android/Glide/RequestBuilderExtensions.cs
@@ -0,0 +1,33 @@
+#nullable enable
+using System.Threading;
+using System.Threading.Tasks;
+using Android.Content;
+using Android.Graphics.Drawables;
+using Bumptech.Glide;
+
+namespace Microsoft.Maui.BumptechGlide
+{
+	public static class RequestBuilderExtensions
+	{
+		public static async Task<Drawable?> SubmitAsync(this RequestBuilder requestBuilder, CancellationToken cancellationToken = default)
+		{
+			var target = requestBuilder.Submit();
+
+			return await target.AsTask<Drawable>(cancellationToken);
+		}
+
+		public static Task<ImageSourceServiceResult?> SubmitAsync(this RequestBuilder requestBuilder, Context context, CancellationToken cancellationToken = default) =>
+			requestBuilder.SubmitAsync(Glide.With(context), cancellationToken);
+
+		public static async Task<ImageSourceServiceResult?> SubmitAsync(this RequestBuilder requestBuilder, RequestManager requestManager, CancellationToken cancellationToken = default)
+		{
+			var target = requestBuilder.Submit();
+
+			var drawable = await target.AsTask<Drawable>(cancellationToken);
+			if (drawable == null)
+				return null;
+
+			return new ImageSourceServiceResult(drawable, () => requestManager.Clear(target));
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/ImageSources/Android/Glide/RequestManagerExtensions.cs b/src/Core/src/ImageSources/Android/Glide/RequestManagerExtensions.cs
new file mode 100644
index 000000000000..24560ace9d92
--- /dev/null
+++ b/src/Core/src/ImageSources/Android/Glide/RequestManagerExtensions.cs
@@ -0,0 +1,17 @@
+#nullable enable
+using Android.Content;
+using Bumptech.Glide;
+
+namespace Microsoft.Maui.BumptechGlide
+{
+	public static class RequestManagerExtensions
+	{
+		public static RequestBuilder Load(this RequestManager requestManager, string drawableIdOrFilename, Context context)
+		{
+			if (context.GetDrawableId(drawableIdOrFilename) is int id && id != 0)
+				return requestManager.Load(id);
+
+			return requestManager.Load(drawableIdOrFilename);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/ImageSources/Android/ImageSourceServiceResult.cs b/src/Core/src/ImageSources/Android/ImageSourceServiceResult.cs
new file mode 100644
index 000000000000..18624209ecec
--- /dev/null
+++ b/src/Core/src/ImageSources/Android/ImageSourceServiceResult.cs
@@ -0,0 +1,40 @@
+#nullable enable
+using System;
+using Android.Graphics.Drawables;
+
+namespace Microsoft.Maui
+{
+	public class ImageSourceServiceResult : IImageSourceServiceResult<Drawable>
+	{
+		Action? _dispose;
+
+		public ImageSourceServiceResult(Drawable drawable, Action? dispose = null)
+			: this(drawable, false, dispose)
+		{
+		}
+
+		public ImageSourceServiceResult(Drawable drawable, bool resolutionDependent, Action? dispose = null)
+		{
+			Value = drawable;
+			IsResolutionDependent = resolutionDependent;
+			_dispose = dispose;
+		}
+
+		public Drawable Value { get; }
+
+		public bool IsResolutionDependent { get; internal set; }
+
+		public bool IsDisposed { get; private set; }
+
+		public void Dispose()
+		{
+			if (IsDisposed)
+				return;
+
+			IsDisposed = true;
+
+			_dispose?.Invoke();
+			_dispose = null;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/ImageSources/FileImageSourceService/FileImageSourceService.Android.cs b/src/Core/src/ImageSources/FileImageSourceService/FileImageSourceService.Android.cs
new file mode 100644
index 000000000000..74c627060b90
--- /dev/null
+++ b/src/Core/src/ImageSources/FileImageSourceService/FileImageSourceService.Android.cs
@@ -0,0 +1,45 @@
+#nullable enable
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Android.Content;
+using Android.Graphics.Drawables;
+using Bumptech.Glide;
+using Microsoft.Extensions.Logging;
+using Microsoft.Maui.BumptechGlide;
+
+namespace Microsoft.Maui
+{
+	public partial class FileImageSourceService
+	{
+		public override Task<IImageSourceServiceResult<Drawable>?> GetDrawableAsync(IImageSource imageSource, Context context, CancellationToken cancellationToken = default) =>
+			GetDrawableAsync((IFileImageSource)imageSource, context, cancellationToken);
+
+		public async Task<IImageSourceServiceResult<Drawable>?> GetDrawableAsync(IFileImageSource imageSource, Context context, CancellationToken cancellationToken = default)
+		{
+			if (imageSource.IsEmpty)
+				return null;
+
+			var filename = imageSource.File;
+
+			try
+			{
+				var result = await Glide
+					.With(context)
+					.Load(filename, context)
+					.SubmitAsync(context, cancellationToken)
+					.ConfigureAwait(false);
+
+				if (result == null)
+					throw new InvalidOperationException("Unable to load image file.");
+
+				return result;
+			}
+			catch (Exception ex)
+			{
+				Logger?.LogWarning(ex, "Unable to load image file '{File}'.", filename);
+				throw;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/ImageSources/FileImageSourceService/FileImageSourceService.Windows.cs b/src/Core/src/ImageSources/FileImageSourceService/FileImageSourceService.Windows.cs
new file mode 100644
index 000000000000..61f389d7dd92
--- /dev/null
+++ b/src/Core/src/ImageSources/FileImageSourceService/FileImageSourceService.Windows.cs
@@ -0,0 +1,79 @@
+#nullable enable
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using Microsoft.UI.Xaml.Media.Imaging;
+using Windows.Storage;
+using WImageSource = Microsoft.UI.Xaml.Media.ImageSource;
+
+namespace Microsoft.Maui
+{
+	public partial class FileImageSourceService
+	{
+		public override Task<IImageSourceServiceResult<WImageSource>?> GetImageSourceAsync(IImageSource imageSource, float scale = 1, CancellationToken cancellationToken = default) =>
+			GetImageSourceAsync((IFileImageSource)imageSource, scale, cancellationToken);
+
+		public async Task<IImageSourceServiceResult<WImageSource>?> GetImageSourceAsync(IFileImageSource imageSource, float scale = 1, CancellationToken cancellationToken = default)
+		{
+			if (imageSource.IsEmpty)
+				return null;
+
+			var filename = imageSource.File;
+
+			try
+			{
+				var image = await GetLocal(filename) ?? GetAppPackage(filename);
+
+				if (image == null)
+					throw new InvalidOperationException("Unable to load image file.");
+
+				var result = new ImageSourceServiceResult(image);
+
+				return result;
+			}
+			catch (Exception ex)
+			{
+				Logger?.LogWarning(ex, "Unable to load image file '{File}'.", filename);
+				throw;
+			}
+		}
+
+		BitmapImage GetAppPackage(string filename)
+		{
+			var imageDirectory = Configuration?.GetImageDirectory();
+			if (!string.IsNullOrEmpty(imageDirectory))
+			{
+				var directory = Path.GetDirectoryName(filename);
+				if (string.IsNullOrEmpty(directory) || !Path.GetFullPath(directory).Equals(Path.GetFullPath(imageDirectory)))
+					filename = Path.Combine(imageDirectory, filename);
+			}
+
+			return new BitmapImage(new Uri("ms-appx:///" + filename));
+		}
+
+		static async Task<BitmapImage?> GetLocal(string filename)
+		{
+			if (Path.IsPathRooted(filename))
+			{
+				try
+				{
+					var file = await StorageFile.GetFileFromPathAsync(filename);
+					using var stream = await file.OpenReadAsync();
+
+					var image = new BitmapImage();
+
+					await image.SetSourceAsync(stream);
+
+					return image;
+				}
+				catch
+				{
+				}
+			}
+
+			return null;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/ImageSources/FileImageSourceService/FileImageSourceService.cs b/src/Core/src/ImageSources/FileImageSourceService/FileImageSourceService.cs
new file mode 100644
index 000000000000..2a216b949ca1
--- /dev/null
+++ b/src/Core/src/ImageSources/FileImageSourceService/FileImageSourceService.cs
@@ -0,0 +1,21 @@
+#nullable enable
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.Maui
+{
+	public partial class FileImageSourceService : ImageSourceService, IImageSourceService<IFileImageSource>
+	{
+		public FileImageSourceService()
+			: this(null, null)
+		{
+		}
+
+		public FileImageSourceService(IImageSourceServiceConfiguration? configuration = null, ILogger<FileImageSourceService>? logger = null)
+			: base(logger)
+		{
+			Configuration = configuration;
+		}
+
+		public IImageSourceServiceConfiguration? Configuration { get; }
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/ImageSources/FileImageSourceService/FileImageSourceService.iOS.cs b/src/Core/src/ImageSources/FileImageSourceService/FileImageSourceService.iOS.cs
new file mode 100644
index 000000000000..46ff6b97bade
--- /dev/null
+++ b/src/Core/src/ImageSources/FileImageSourceService/FileImageSourceService.iOS.cs
@@ -0,0 +1,46 @@
+#nullable enable
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using UIKit;
+
+namespace Microsoft.Maui
+{
+	public partial class FileImageSourceService
+	{
+		public override Task<IImageSourceServiceResult<UIImage>?> GetImageAsync(IImageSource imageSource, float scale = 1, CancellationToken cancellationToken = default) =>
+			GetImageAsync((IFileImageSource)imageSource, scale, cancellationToken);
+
+		public Task<IImageSourceServiceResult<UIImage>?> GetImageAsync(IFileImageSource imageSource, float scale = 1, CancellationToken cancellationToken = default)
+		{
+			if (imageSource.IsEmpty)
+				return FromResult(null);
+
+			var filename = imageSource.File;
+
+			try
+			{
+				var image = File.Exists(filename)
+					? UIImage.FromFile(filename)
+					: UIImage.FromBundle(filename);
+
+				if (image == null)
+					throw new InvalidOperationException("Unable to load image file.");
+
+				var result = new ImageSourceServiceResult(image, () => image.Dispose());
+
+				return FromResult(result);
+			}
+			catch (Exception ex)
+			{
+				Logger?.LogWarning(ex, "Unable to load image file '{File}'.", filename);
+				throw;
+			}
+		}
+
+		static Task<IImageSourceServiceResult<UIImage>?> FromResult(IImageSourceServiceResult<UIImage>? result) =>
+			Task.FromResult(result);
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/ImageSources/FontImageSourceService/FontImageSourceService.Android.cs b/src/Core/src/ImageSources/FontImageSourceService/FontImageSourceService.Android.cs
new file mode 100644
index 000000000000..7559c2357597
--- /dev/null
+++ b/src/Core/src/ImageSources/FontImageSourceService/FontImageSourceService.Android.cs
@@ -0,0 +1,88 @@
+#nullable enable
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Android.Content;
+using Android.Graphics;
+using Android.Graphics.Drawables;
+using Android.Util;
+using Bumptech.Glide;
+using Microsoft.Extensions.Logging;
+using Microsoft.Maui.BumptechGlide;
+
+namespace Microsoft.Maui
+{
+	public partial class FontImageSourceService
+	{
+		public override Task<IImageSourceServiceResult<Drawable>?> GetDrawableAsync(IImageSource imageSource, Context context, CancellationToken cancellationToken = default) =>
+			GetDrawableAsync((IFontImageSource)imageSource, context, cancellationToken);
+
+		public async Task<IImageSourceServiceResult<Drawable>?> GetDrawableAsync(IFontImageSource imageSource, Context context, CancellationToken cancellationToken = default)
+		{
+			if (imageSource.IsEmpty)
+				return null;
+
+			var glyph = imageSource.Glyph;
+
+			var sp = FontManager.GetFontSize(imageSource.Font);
+			var textSize = TypedValue.ApplyDimension(ComplexUnitType.Dip, sp, context.Resources?.DisplayMetrics);
+			var typeface = FontManager.GetTypeface(imageSource.Font);
+			var color = (imageSource.Color ?? Graphics.Colors.White).ToNative();
+
+			try
+			{
+				var result = await Glide
+					.With(context)
+					.Load(new FontImageSourceModel(glyph, textSize, typeface, color))
+					.SubmitAsync(context, cancellationToken)
+					.ConfigureAwait(false);
+
+				if (result == null)
+					throw new InvalidOperationException("Unable to generate font image.");
+
+				return result;
+			}
+			catch (Exception ex)
+			{
+				Logger?.LogWarning(ex, "Unable to generate font image '{Glyph}'.", glyph);
+				throw;
+			}
+		}
+
+		internal static Bitmap RenderBitmap(IModel model, Func<int, int, Bitmap.Config, Bitmap> newBitmap)
+		{
+			using var paint = new Paint
+			{
+				TextSize = model.TextSize,
+				Color = model.Color,
+				TextAlign = Paint.Align.Left,
+				AntiAlias = true,
+			};
+
+			if (model.Typeface != null)
+				paint.SetTypeface(model.Typeface);
+
+			var width = (int)(paint.MeasureText(model.Glyph) + .5f);
+			var baseline = (int)(-paint.Ascent() + .5f);
+			var height = (int)(baseline + paint.Descent() + .5f);
+
+			var bitmap = newBitmap(width, height, Bitmap.Config.Argb8888!);
+
+			using var canvas = new Canvas(bitmap);
+			canvas.DrawText(model.Glyph, 0, baseline, paint);
+
+			return bitmap;
+		}
+
+		internal interface IModel
+		{
+			Color Color { get; }
+
+			string Glyph { get; }
+
+			float TextSize { get; }
+
+			Typeface? Typeface { get; }
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/ImageSources/FontImageSourceService/FontImageSourceService.Windows.cs b/src/Core/src/ImageSources/FontImageSourceService/FontImageSourceService.Windows.cs
new file mode 100644
index 000000000000..d49705cd3d3b
--- /dev/null
+++ b/src/Core/src/ImageSources/FontImageSourceService/FontImageSourceService.Windows.cs
@@ -0,0 +1,120 @@
+#nullable enable
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using Microsoft.Graphics.Canvas;
+using Microsoft.Graphics.Canvas.Text;
+using Microsoft.Graphics.Canvas.UI.Xaml;
+using Microsoft.Maui.Graphics;
+using WImageSource = Microsoft.UI.Xaml.Media.ImageSource;
+
+namespace Microsoft.Maui
+{
+	public partial class FontImageSourceService
+	{
+		const float BaseLogicalDpi = 96.0f;
+
+		public override Task<IImageSourceServiceResult<WImageSource>?> GetImageSourceAsync(IImageSource imageSource, float scale = 1, CancellationToken cancellationToken = default) =>
+			GetImageSourceAsync((IFontImageSource)imageSource, scale, cancellationToken);
+
+		public Task<IImageSourceServiceResult<WImageSource>?> GetImageSourceAsync(IFontImageSource imageSource, float scale = 1, CancellationToken cancellationToken = default)
+		{
+			if (imageSource.IsEmpty)
+				return FromResult(null);
+
+			try
+			{
+				// TODO: use a cached way
+				var image = RenderImageSource(imageSource, scale);
+
+				if (image == null)
+					throw new InvalidOperationException("Unable to generate font image.");
+
+				var result = new ImageSourceServiceResult(image, true);
+
+				return FromResult(result);
+			}
+			catch (Exception ex)
+			{
+				Logger?.LogWarning(ex, "Unable to generate font image '{Glyph}'.", imageSource.Glyph);
+				throw;
+			}
+		}
+
+		static Task<IImageSourceServiceResult<WImageSource>?> FromResult(IImageSourceServiceResult<WImageSource>? result) =>
+			Task.FromResult(result);
+
+		internal CanvasImageSource RenderImageSource(IFontImageSource imageSource, float scale)
+		{
+			// TODO: The DPI not working as the view is not respecting the
+			//       value, so just reset to 1 to keep the correct size.
+			scale = 1;
+
+			var dpi = scale * BaseLogicalDpi;
+
+			var fontFamily = GetFontSource(imageSource);
+			var fontSize = (float)imageSource.Font.FontSize;
+			var color = (imageSource.Color ?? Colors.White).ToWindowsColor();
+
+			var textFormat = new CanvasTextFormat
+			{
+				FontFamily = fontFamily,
+				FontSize = fontSize,
+				HorizontalAlignment = CanvasHorizontalAlignment.Center,
+				VerticalAlignment = CanvasVerticalAlignment.Center,
+				Options = CanvasDrawTextOptions.Default
+			};
+
+			var device = CanvasDevice.GetSharedDevice();
+			using var layout = new CanvasTextLayout(device, imageSource.Glyph, textFormat, 0, 0);
+
+			// add a 1px padding all around
+			var canvasWidth = (float)layout.DrawBounds.Width + 2;
+			var canvasHeight = (float)layout.DrawBounds.Height + 2;
+
+			var canvasImageSource = new CanvasImageSource(device, canvasWidth, canvasHeight, dpi);
+			using (var ds = canvasImageSource.CreateDrawingSession(UI.Colors.Transparent))
+			{
+				// offset by 1px as we added a 1px padding
+				var x = (layout.DrawBounds.X * -1) + 1;
+				var y = (layout.DrawBounds.Y * -1) + 1;
+
+				ds.DrawTextLayout(layout, (float)x, (float)y, color);
+			}
+
+			return canvasImageSource;
+		}
+
+		string GetFontSource(IFontImageSource imageSource)
+		{
+			if (imageSource == null)
+				return string.Empty;
+
+			var fontFamily = FontManager.GetFontFamily(imageSource.Font);
+
+			var fontSource = fontFamily.Source;
+
+			var allFamilies = fontFamily.Source.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+
+			if (allFamilies.Length > 1)
+			{
+				// There's really no perfect solution to handle font families with fallbacks (comma-separated)	
+				// So if the font family has fallbacks, only one is taken, because CanvasTextFormat	
+				// only supports one font family
+				var source = imageSource.Font.FontFamily;
+
+				foreach (var family in allFamilies)
+				{
+					if (family.Contains(source))
+					{
+						fontSource = family;
+						break;
+					}
+				}
+			}
+
+			return fontSource;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/ImageSources/FontImageSourceService/FontImageSourceService.cs b/src/Core/src/ImageSources/FontImageSourceService/FontImageSourceService.cs
new file mode 100644
index 000000000000..8611c764810b
--- /dev/null
+++ b/src/Core/src/ImageSources/FontImageSourceService/FontImageSourceService.cs
@@ -0,0 +1,21 @@
+#nullable enable
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.Maui
+{
+	public partial class FontImageSourceService : ImageSourceService, IImageSourceService<IFontImageSource>
+	{
+		public FontImageSourceService(IFontManager fontManager)
+			: this(fontManager, null)
+		{
+		}
+
+		public FontImageSourceService(IFontManager fontManager, ILogger<FontImageSourceService>? logger = null)
+			: base(logger)
+		{
+			FontManager = fontManager;
+		}
+
+		public IFontManager FontManager { get; }
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/ImageSources/FontImageSourceService/FontImageSourceService.iOS.cs b/src/Core/src/ImageSources/FontImageSourceService/FontImageSourceService.iOS.cs
new file mode 100644
index 000000000000..0f78963ca491
--- /dev/null
+++ b/src/Core/src/ImageSources/FontImageSourceService/FontImageSourceService.iOS.cs
@@ -0,0 +1,70 @@
+#nullable enable
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using CoreGraphics;
+using Foundation;
+using Microsoft.Extensions.Logging;
+using Microsoft.Maui.Graphics;
+using UIKit;
+
+namespace Microsoft.Maui
+{
+	public partial class FontImageSourceService
+	{
+		public override Task<IImageSourceServiceResult<UIImage>?> GetImageAsync(IImageSource imageSource, float scale = 1, CancellationToken cancellationToken = default) =>
+			GetImageAsync((IFontImageSource)imageSource, scale, cancellationToken);
+
+		public Task<IImageSourceServiceResult<UIImage>?> GetImageAsync(IFontImageSource imageSource, float scale = 1, CancellationToken cancellationToken = default)
+		{
+			if (imageSource.IsEmpty)
+				return FromResult(null);
+
+			try
+			{
+				// TODO: use a cached way
+				var image = RenderImage(imageSource, scale);
+
+				if (image == null)
+					throw new InvalidOperationException("Unable to generate font image.");
+
+				var result = new ImageSourceServiceResult(image, true, () => image.Dispose());
+
+				return FromResult(result);
+			}
+			catch (Exception ex)
+			{
+				Logger?.LogWarning(ex, "Unable to generate font image '{Glyph}'.", imageSource.Glyph);
+				throw;
+			}
+		}
+
+		static Task<IImageSourceServiceResult<UIImage>?> FromResult(IImageSourceServiceResult<UIImage>? result) =>
+			Task.FromResult(result);
+
+		internal UIImage RenderImage(IFontImageSource imageSource, float scale)
+		{
+			var font = FontManager.GetFont(imageSource.Font);
+			var color = (imageSource.Color ?? Colors.White).ToNative();
+			var glyph = (NSString)imageSource.Glyph;
+
+			var attString = new NSAttributedString(glyph, font, color);
+			var imagesize = glyph.GetSizeUsingAttributes(attString.GetUIKitAttributes(0, out _));
+
+			UIGraphics.BeginImageContextWithOptions(imagesize, false, scale);
+			var ctx = new NSStringDrawingContext();
+
+			var boundingRect = attString.GetBoundingRect(imagesize, 0, ctx);
+			attString.DrawString(new CGRect(
+				imagesize.Width / 2 - boundingRect.Size.Width / 2,
+				imagesize.Height / 2 - boundingRect.Size.Height / 2,
+				imagesize.Width,
+				imagesize.Height));
+
+			var image = UIGraphics.GetImageFromCurrentImageContext();
+			UIGraphics.EndImageContext();
+
+			return image.ImageWithRenderingMode(UIImageRenderingMode.AlwaysOriginal);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/ImageSources/IFileImageSource.cs b/src/Core/src/ImageSources/IFileImageSource.cs
new file mode 100644
index 000000000000..7194aca6dffe
--- /dev/null
+++ b/src/Core/src/ImageSources/IFileImageSource.cs
@@ -0,0 +1,8 @@
+#nullable enable
+namespace Microsoft.Maui
+{
+	public interface IFileImageSource : IImageSource
+	{
+		string File { get; }
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/ImageSources/IFontImageSource.cs b/src/Core/src/ImageSources/IFontImageSource.cs
new file mode 100644
index 000000000000..0948ec3be2db
--- /dev/null
+++ b/src/Core/src/ImageSources/IFontImageSource.cs
@@ -0,0 +1,14 @@
+#nullable enable
+using Microsoft.Maui.Graphics;
+
+namespace Microsoft.Maui
+{
+	public interface IFontImageSource : IImageSource
+	{
+		Color Color { get; }
+
+		Font Font { get; }
+
+		string Glyph { get; }
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/ImageSources/IImageSource.cs b/src/Core/src/ImageSources/IImageSource.cs
new file mode 100644
index 000000000000..325cef0422d4
--- /dev/null
+++ b/src/Core/src/ImageSources/IImageSource.cs
@@ -0,0 +1,8 @@
+#nullable enable
+namespace Microsoft.Maui
+{
+	public interface IImageSource
+	{
+		bool IsEmpty { get; }
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/ImageSources/IImageSourceService.cs b/src/Core/src/ImageSources/IImageSourceService.cs
new file mode 100644
index 000000000000..f7632c81c905
--- /dev/null
+++ b/src/Core/src/ImageSources/IImageSourceService.cs
@@ -0,0 +1,31 @@
+#nullable enable
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Microsoft.Maui
+{
+	public interface IImageSourceService
+	{
+#if __ANDROID__
+		Task<IImageSourceServiceResult<Android.Graphics.Drawables.Drawable>?> GetDrawableAsync(
+			IImageSource imageSource,
+			Android.Content.Context context,
+			CancellationToken cancellationToken = default);
+#elif __IOS__
+		Task<IImageSourceServiceResult<UIKit.UIImage>?> GetImageAsync(
+			IImageSource imageSource,
+			float scale = 1,
+			CancellationToken cancellationToken = default);
+#elif WINDOWS
+		Task<IImageSourceServiceResult<UI.Xaml.Media.ImageSource>?> GetImageSourceAsync(
+			IImageSource imageSource,
+			float scale = 1,
+			CancellationToken cancellationToken = default);
+#endif
+	}
+
+	public interface IImageSourceService<T> : IImageSourceService
+		where T : IImageSource
+	{
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/ImageSources/IImageSourceServiceConfiguration.cs b/src/Core/src/ImageSources/IImageSourceServiceConfiguration.cs
new file mode 100644
index 000000000000..63c11c49dc4a
--- /dev/null
+++ b/src/Core/src/ImageSources/IImageSourceServiceConfiguration.cs
@@ -0,0 +1,9 @@
+#nullable enable
+using System.Collections.Generic;
+
+namespace Microsoft.Maui
+{
+	public interface IImageSourceServiceConfiguration : IDictionary<string, string>
+	{
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/ImageSources/IImageSourceServiceResult.cs b/src/Core/src/ImageSources/IImageSourceServiceResult.cs
new file mode 100644
index 000000000000..68754e8246f8
--- /dev/null
+++ b/src/Core/src/ImageSources/IImageSourceServiceResult.cs
@@ -0,0 +1,14 @@
+#nullable enable
+using System;
+
+namespace Microsoft.Maui
+{
+	public interface IImageSourceServiceResult<T> : IDisposable
+	{
+		T Value { get; }
+
+		bool IsResolutionDependent { get; }
+
+		bool IsDisposed { get; }
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/ImageSources/IStreamImageSource.cs b/src/Core/src/ImageSources/IStreamImageSource.cs
new file mode 100644
index 000000000000..c0dfccd6e380
--- /dev/null
+++ b/src/Core/src/ImageSources/IStreamImageSource.cs
@@ -0,0 +1,12 @@
+#nullable enable
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Microsoft.Maui
+{
+	public interface IStreamImageSource : IImageSource
+	{
+		Task<Stream> GetStreamAsync(CancellationToken cancellationToken = default);
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/ImageSources/IUriImageSource.cs b/src/Core/src/ImageSources/IUriImageSource.cs
new file mode 100644
index 000000000000..b7f2e3bf98fa
--- /dev/null
+++ b/src/Core/src/ImageSources/IUriImageSource.cs
@@ -0,0 +1,14 @@
+#nullable enable
+using System;
+
+namespace Microsoft.Maui
+{
+	public interface IUriImageSource : IImageSource
+	{
+		Uri Uri { get; }
+
+		TimeSpan CacheValidity { get; }
+
+		bool CachingEnabled { get; }
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/ImageSources/ImageSourceService.cs b/src/Core/src/ImageSources/ImageSourceService.cs
new file mode 100644
index 000000000000..5c1553b383f7
--- /dev/null
+++ b/src/Core/src/ImageSources/ImageSourceService.cs
@@ -0,0 +1,34 @@
+#nullable enable
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.Maui
+{
+	public abstract class ImageSourceService : IImageSourceService
+	{
+		public ImageSourceService(ILogger? logger = null)
+		{
+			Logger = logger;
+		}
+
+		public ILogger? Logger { get; }
+
+#if __ANDROID__
+		public abstract Task<IImageSourceServiceResult<Android.Graphics.Drawables.Drawable>?> GetDrawableAsync(
+			IImageSource imageSource,
+			Android.Content.Context context,
+			CancellationToken cancellationToken = default);
+#elif __IOS__
+		public abstract Task<IImageSourceServiceResult<UIKit.UIImage>?> GetImageAsync(
+			IImageSource imageSource,
+			float scale = 1,
+			CancellationToken cancellationToken = default);
+#elif WINDOWS
+		public abstract Task<IImageSourceServiceResult<UI.Xaml.Media.ImageSource>?> GetImageSourceAsync(
+			IImageSource imageSource,
+			float scale = 1,
+			CancellationToken cancellationToken = default);
+#endif
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/ImageSources/ImageSourceServiceConfiguration.cs b/src/Core/src/ImageSources/ImageSourceServiceConfiguration.cs
new file mode 100644
index 000000000000..0bb27393cf7f
--- /dev/null
+++ b/src/Core/src/ImageSources/ImageSourceServiceConfiguration.cs
@@ -0,0 +1,9 @@
+#nullable enable
+using System.Collections.Generic;
+
+namespace Microsoft.Maui
+{
+	public class ImageSourceServiceConfiguration : Dictionary<string, string>, IImageSourceServiceConfiguration
+	{
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/ImageSources/ImageSourceServiceConfigurationExtensions.cs b/src/Core/src/ImageSources/ImageSourceServiceConfigurationExtensions.cs
new file mode 100644
index 000000000000..2b653489a17c
--- /dev/null
+++ b/src/Core/src/ImageSources/ImageSourceServiceConfigurationExtensions.cs
@@ -0,0 +1,14 @@
+#nullable enable
+namespace Microsoft.Maui
+{
+	public static class ImageSourceServiceConfigurationExtensions
+	{
+		public const string ImageDirectoryKey = "ImageDirectory";
+
+		public static void SetImageDirectory(this IImageSourceServiceConfiguration config, string directory) =>
+			config[ImageDirectoryKey] = directory;
+
+		public static string? GetImageDirectory(this IImageSourceServiceConfiguration config) =>
+			config.TryGetValue(ImageDirectoryKey, out var directory) ? directory : null;
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/ImageSources/ImageSourceServiceResultManager.cs b/src/Core/src/ImageSources/ImageSourceServiceResultManager.cs
new file mode 100644
index 000000000000..b69fd9e6b23d
--- /dev/null
+++ b/src/Core/src/ImageSources/ImageSourceServiceResultManager.cs
@@ -0,0 +1,49 @@
+#nullable enable
+using System;
+using System.Threading;
+
+namespace Microsoft.Maui.Handlers
+{
+	class ImageSourceServiceResultManager
+	{
+		CancellationTokenSource? _sourceCancellation;
+		IDisposable? _sourceResult;
+
+		public CancellationToken Token =>
+			_sourceCancellation?.Token ?? default;
+
+		public bool IsResolutionDependent { get; private set; }
+
+		public CancellationToken BeginLoad()
+		{
+			_sourceResult?.Dispose();
+
+			_sourceCancellation?.Cancel();
+			_sourceCancellation = new CancellationTokenSource();
+
+			return Token;
+		}
+
+		public void CompleteLoad<T>(IImageSourceServiceResult<T>? result)
+		{
+			CompleteLoad((IDisposable?)result);
+
+			IsResolutionDependent = result?.IsResolutionDependent ?? false;
+		}
+
+		public void CompleteLoad(IDisposable? result)
+		{
+			_sourceResult = result;
+			_sourceCancellation?.Dispose();
+			_sourceCancellation = null;
+
+			IsResolutionDependent = false;
+		}
+
+		public void Reset()
+		{
+			BeginLoad();
+			CompleteLoad(null);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/ImageSources/StreamImageSourceService/StreamImageSourceService.Android.cs b/src/Core/src/ImageSources/StreamImageSourceService/StreamImageSourceService.Android.cs
new file mode 100644
index 000000000000..1ca9b7ddce55
--- /dev/null
+++ b/src/Core/src/ImageSources/StreamImageSourceService/StreamImageSourceService.Android.cs
@@ -0,0 +1,54 @@
+#nullable enable
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Android.Content;
+using Android.Graphics.Drawables;
+using Android.Runtime;
+using Bumptech.Glide;
+using Bumptech.Glide.Load.Engine;
+using Microsoft.Extensions.Logging;
+using Microsoft.Maui.BumptechGlide;
+
+namespace Microsoft.Maui
+{
+	public partial class StreamImageSourceService
+	{
+		public override Task<IImageSourceServiceResult<Drawable>?> GetDrawableAsync(IImageSource imageSource, Context context, CancellationToken cancellationToken = default) =>
+			GetDrawableAsync((IStreamImageSource)imageSource, context, cancellationToken);
+
+		public async Task<IImageSourceServiceResult<Drawable>?> GetDrawableAsync(IStreamImageSource imageSource, Context context, CancellationToken cancellationToken = default)
+		{
+			if (imageSource.IsEmpty)
+				return null;
+
+			try
+			{
+				var stream = await imageSource.GetStreamAsync(cancellationToken).ConfigureAwait(false);
+
+				// We can use the .NET stream directly because we register the InputStreamModelLoader.
+				// There are 2 alternatives:
+				//  - Load the bitmap manually and pass that along, but then we do not get the decoding features.
+				//  - Copy the stream into a byte array and that is double memory usage - especially for large streams.
+				var inputStream = new InputStreamAdapter(stream);
+
+				var result = await Glide
+					.With(context)
+					.Load(inputStream)
+					.SetDiskCacheStrategy(DiskCacheStrategy.None)
+					.SubmitAsync(context, cancellationToken)
+					.ConfigureAwait(false);
+
+				if (result == null)
+					throw new InvalidOperationException("Unable to load image stream.");
+
+				return result;
+			}
+			catch (Exception ex)
+			{
+				Logger?.LogWarning(ex, "Unable to load image stream.");
+				throw;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/ImageSources/StreamImageSourceService/StreamImageSourceService.Windows.cs b/src/Core/src/ImageSources/StreamImageSourceService/StreamImageSourceService.Windows.cs
new file mode 100644
index 000000000000..6036773c2903
--- /dev/null
+++ b/src/Core/src/ImageSources/StreamImageSourceService/StreamImageSourceService.Windows.cs
@@ -0,0 +1,45 @@
+#nullable enable
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using Microsoft.UI.Xaml.Media.Imaging;
+using WImageSource = Microsoft.UI.Xaml.Media.ImageSource;
+
+namespace Microsoft.Maui
+{
+	public partial class StreamImageSourceService
+	{
+		public override Task<IImageSourceServiceResult<WImageSource>?> GetImageSourceAsync(IImageSource imageSource, float scale = 1, CancellationToken cancellationToken = default) =>
+			GetImageSourceAsync((IStreamImageSource)imageSource, scale, cancellationToken);
+
+		public async Task<IImageSourceServiceResult<WImageSource>?> GetImageSourceAsync(IStreamImageSource imageSource, float scale = 1, CancellationToken cancellationToken = default)
+		{
+			if (imageSource.IsEmpty)
+				return null;
+
+			try
+			{
+				using var stream = await imageSource.GetStreamAsync(cancellationToken);
+
+				if (stream == null)
+					throw new InvalidOperationException("Unable to load image stream.");
+
+				var image = new BitmapImage();
+
+				using var ras = stream.AsRandomAccessStream();
+				await image.SetSourceAsync(ras);
+
+				var result = new ImageSourceServiceResult(image);
+
+				return result;
+			}
+			catch (Exception ex)
+			{
+				Logger?.LogWarning(ex, "Unable to load image stream.");
+				throw;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/ImageSources/StreamImageSourceService/StreamImageSourceService.cs b/src/Core/src/ImageSources/StreamImageSourceService/StreamImageSourceService.cs
new file mode 100644
index 000000000000..cef7fd4875bb
--- /dev/null
+++ b/src/Core/src/ImageSources/StreamImageSourceService/StreamImageSourceService.cs
@@ -0,0 +1,18 @@
+#nullable enable
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.Maui
+{
+	public partial class StreamImageSourceService : ImageSourceService, IImageSourceService<IStreamImageSource>
+	{
+		public StreamImageSourceService()
+			: this(null)
+		{
+		}
+
+		public StreamImageSourceService(ILogger<StreamImageSourceService>? logger = null)
+			: base(logger)
+		{
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/ImageSources/StreamImageSourceService/StreamImageSourceService.iOS.cs b/src/Core/src/ImageSources/StreamImageSourceService/StreamImageSourceService.iOS.cs
new file mode 100644
index 000000000000..5255786ac5de
--- /dev/null
+++ b/src/Core/src/ImageSources/StreamImageSourceService/StreamImageSourceService.iOS.cs
@@ -0,0 +1,45 @@
+#nullable enable
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Foundation;
+using Microsoft.Extensions.Logging;
+using UIKit;
+
+namespace Microsoft.Maui
+{
+	public partial class StreamImageSourceService
+	{
+		public override Task<IImageSourceServiceResult<UIImage>?> GetImageAsync(IImageSource imageSource, float scale = 1, CancellationToken cancellationToken = default) =>
+			GetImageAsync((IStreamImageSource)imageSource, scale, cancellationToken);
+
+		public async Task<IImageSourceServiceResult<UIImage>?> GetImageAsync(IStreamImageSource imageSource, float scale = 1, CancellationToken cancellationToken = default)
+		{
+			if (imageSource.IsEmpty)
+				return null;
+
+			try
+			{
+				var stream = await imageSource.GetStreamAsync(cancellationToken).ConfigureAwait(false);
+
+				if (stream == null)
+					throw new InvalidOperationException("Unable to load image stream.");
+
+				using var data = NSData.FromStream(stream);
+				var image = UIImage.LoadFromData(data, scale);
+
+				if (image == null)
+					throw new InvalidOperationException("Unable to decode image from stream.");
+
+				var result = new ImageSourceServiceResult(image, () => image.Dispose());
+
+				return result;
+			}
+			catch (Exception ex)
+			{
+				Logger?.LogWarning(ex, "Unable to load image stream.");
+				throw;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/ImageSources/UriImageSourceService/UriImageSourceService.Android.cs b/src/Core/src/ImageSources/UriImageSourceService/UriImageSourceService.Android.cs
new file mode 100644
index 000000000000..d90a4897043f
--- /dev/null
+++ b/src/Core/src/ImageSources/UriImageSourceService/UriImageSourceService.Android.cs
@@ -0,0 +1,55 @@
+#nullable enable
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Android.Content;
+using Android.Graphics.Drawables;
+using Bumptech.Glide;
+using Bumptech.Glide.Load.Engine;
+using Microsoft.Extensions.Logging;
+using Microsoft.Maui.BumptechGlide;
+
+namespace Microsoft.Maui
+{
+	public partial class UriImageSourceService
+	{
+		public override Task<IImageSourceServiceResult<Drawable>?> GetDrawableAsync(IImageSource imageSource, Context context, CancellationToken cancellationToken = default) =>
+			GetDrawableAsync((IUriImageSource)imageSource, context, cancellationToken);
+
+		public async Task<IImageSourceServiceResult<Drawable>?> GetDrawableAsync(IUriImageSource imageSource, Context context, CancellationToken cancellationToken = default)
+		{
+			if (imageSource.IsEmpty)
+				return null;
+
+			var uri = imageSource.Uri;
+
+			try
+			{
+				var builder = Glide
+					.With(context)
+					.Load(uri.OriginalString);
+
+				if (!imageSource.CachingEnabled)
+				{
+					builder = builder
+						.SetDiskCacheStrategy(DiskCacheStrategy.None)
+						.SkipMemoryCache(true);
+				}
+
+				var result = await builder
+					.SubmitAsync(context, cancellationToken)
+					.ConfigureAwait(false);
+
+				if (result == null)
+					throw new InvalidOperationException($"Unable to load image URI '{uri}'.");
+
+				return result;
+			}
+			catch (Exception ex)
+			{
+				Logger?.LogWarning(ex, "Unable to load image URI '{Uri}'.", uri);
+				throw;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/ImageSources/UriImageSourceService/UriImageSourceService.Windows.cs b/src/Core/src/ImageSources/UriImageSourceService/UriImageSourceService.Windows.cs
new file mode 100644
index 000000000000..36be3e7eb387
--- /dev/null
+++ b/src/Core/src/ImageSources/UriImageSourceService/UriImageSourceService.Windows.cs
@@ -0,0 +1,49 @@
+#nullable enable
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using Microsoft.UI.Xaml.Media.Imaging;
+using WImageSource = Microsoft.UI.Xaml.Media.ImageSource;
+
+namespace Microsoft.Maui
+{
+	public partial class UriImageSourceService
+	{
+		public override Task<IImageSourceServiceResult<WImageSource>?> GetImageSourceAsync(IImageSource imageSource, float scale = 1, CancellationToken cancellationToken = default) =>
+			GetImageSourceAsync((IUriImageSource)imageSource, scale, cancellationToken);
+
+		public async Task<IImageSourceServiceResult<WImageSource>?> GetImageSourceAsync(IUriImageSource imageSource, float scale = 1, CancellationToken cancellationToken = default)
+		{
+			if (imageSource.IsEmpty)
+				return null;
+
+			// TODO: use a real caching library with the URI
+			if (imageSource is not IStreamImageSource streamImageSource)
+				throw new InvalidOperationException("Unable to load URI as a stream.");
+
+			try
+			{
+				using var stream = await streamImageSource.GetStreamAsync(cancellationToken);
+
+				if (stream == null)
+					throw new InvalidOperationException("Unable to load image stream.");
+
+				var image = new BitmapImage();
+
+				using var ras = stream.AsRandomAccessStream();
+				await image.SetSourceAsync(ras);
+
+				var result = new ImageSourceServiceResult(image);
+
+				return result;
+			}
+			catch (Exception ex)
+			{
+				Logger?.LogWarning(ex, "Unable to load image URI '{Uri}'.", imageSource.Uri);
+				throw;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/ImageSources/UriImageSourceService/UriImageSourceService.cs b/src/Core/src/ImageSources/UriImageSourceService/UriImageSourceService.cs
new file mode 100644
index 000000000000..b318c2051dff
--- /dev/null
+++ b/src/Core/src/ImageSources/UriImageSourceService/UriImageSourceService.cs
@@ -0,0 +1,18 @@
+#nullable enable
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.Maui
+{
+	public partial class UriImageSourceService : ImageSourceService, IImageSourceService<IUriImageSource>
+	{
+		public UriImageSourceService()
+			: this(null)
+		{
+		}
+
+		public UriImageSourceService(ILogger<UriImageSourceService>? logger = null)
+			: base(logger)
+		{
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/ImageSources/UriImageSourceService/UriImageSourceService.iOS.cs b/src/Core/src/ImageSources/UriImageSourceService/UriImageSourceService.iOS.cs
new file mode 100644
index 000000000000..d628276e5c20
--- /dev/null
+++ b/src/Core/src/ImageSources/UriImageSourceService/UriImageSourceService.iOS.cs
@@ -0,0 +1,48 @@
+#nullable enable
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Foundation;
+using Microsoft.Extensions.Logging;
+using UIKit;
+
+namespace Microsoft.Maui
+{
+	public partial class UriImageSourceService
+	{
+		public override Task<IImageSourceServiceResult<UIImage>?> GetImageAsync(IImageSource imageSource, float scale = 1, CancellationToken cancellationToken = default) =>
+			GetImageAsync((IUriImageSource)imageSource, scale, cancellationToken);
+
+		public async Task<IImageSourceServiceResult<UIImage>?> GetImageAsync(IUriImageSource imageSource, float scale = 1, CancellationToken cancellationToken = default)
+		{
+			if (imageSource.IsEmpty)
+				return null;
+
+			try
+			{
+				// TODO: use a real caching library with the URI
+				if (imageSource is not IStreamImageSource streamImageSource)
+					return null;
+
+				using var stream = await streamImageSource.GetStreamAsync(cancellationToken).ConfigureAwait(false);
+
+				if (stream == null)
+					throw new InvalidOperationException($"Unable to load image stream from URI '{imageSource.Uri}'.");
+
+				var image = UIImage.LoadFromData(NSData.FromStream(stream), scale);
+
+				if (image == null)
+					throw new InvalidOperationException($"Unable to decode image from URI '{imageSource.Uri}'.");
+
+				var result = new ImageSourceServiceResult(image, () => image.Dispose());
+
+				return result;
+			}
+			catch (Exception ex)
+			{
+				Logger?.LogWarning(ex, "Unable to load image URI '{Uri}'.", imageSource.Uri);
+				throw;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/ImageSources/Windows/ImageSourceServiceResult.cs b/src/Core/src/ImageSources/Windows/ImageSourceServiceResult.cs
new file mode 100644
index 000000000000..80a7a8832b7c
--- /dev/null
+++ b/src/Core/src/ImageSources/Windows/ImageSourceServiceResult.cs
@@ -0,0 +1,40 @@
+#nullable enable
+using System;
+using WImageSource = Microsoft.UI.Xaml.Media.ImageSource;
+
+namespace Microsoft.Maui
+{
+	public class ImageSourceServiceResult : IImageSourceServiceResult<WImageSource>
+	{
+		Action? _dispose;
+
+		public ImageSourceServiceResult(WImageSource image, Action? dispose = null)
+			: this(image, false, dispose)
+		{
+		}
+
+		public ImageSourceServiceResult(WImageSource image, bool resolutionDependent, Action? dispose = null)
+		{
+			Value = image;
+			IsResolutionDependent = resolutionDependent;
+			_dispose = dispose;
+		}
+
+		public WImageSource Value { get; }
+
+		public bool IsResolutionDependent { get; }
+
+		public bool IsDisposed { get; private set; }
+
+		public void Dispose()
+		{
+			if (IsDisposed)
+				return;
+
+			IsDisposed = true;
+
+			_dispose?.Invoke();
+			_dispose = null;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/ImageSources/iOS/ImageSourceServiceResult.cs b/src/Core/src/ImageSources/iOS/ImageSourceServiceResult.cs
new file mode 100644
index 000000000000..1c6e7e58c0b8
--- /dev/null
+++ b/src/Core/src/ImageSources/iOS/ImageSourceServiceResult.cs
@@ -0,0 +1,40 @@
+#nullable enable
+using System;
+using UIKit;
+
+namespace Microsoft.Maui
+{
+	public class ImageSourceServiceResult : IImageSourceServiceResult<UIImage>
+	{
+		Action? _dispose;
+
+		public ImageSourceServiceResult(UIImage image, Action? dispose = null)
+			: this(image, false, dispose)
+		{
+		}
+
+		public ImageSourceServiceResult(UIImage image, bool resolutionDependent, Action? dispose = null)
+		{
+			Value = image;
+			IsResolutionDependent = resolutionDependent;
+			_dispose = dispose;
+		}
+
+		public UIImage Value { get; }
+
+		public bool IsResolutionDependent { get; }
+
+		public bool IsDisposed { get; private set; }
+
+		public void Dispose()
+		{
+			if (IsDisposed)
+				return;
+
+			IsDisposed = true;
+
+			_dispose?.Invoke();
+			_dispose = null;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/IsExternalInit.cs b/src/Core/src/IsExternalInit.cs
new file mode 100644
index 000000000000..64dddd5eec55
--- /dev/null
+++ b/src/Core/src/IsExternalInit.cs
@@ -0,0 +1,11 @@
+#nullable enable
+
+// https://docs.microsoft.com/en-us/dotnet/api/system.runtime.compilerservices.isexternalinit?view=net-5.0
+// https://developercommunity.visualstudio.com/t/error-cs0518-predefined-type-systemruntimecompiler/1244809
+// Adding this because at least one of the target frameworks doesn't include it; hopefully we can drop this at some point
+// (and hopefully before release)
+// TODO ezhart Evaluate whether we still need this
+namespace System.Runtime.CompilerServices
+{
+	internal static class IsExternalInit { }
+}
diff --git a/src/Core/src/Layouts/GridLayoutManager.cs b/src/Core/src/Layouts/GridLayoutManager.cs
index 30815c4a138f..d9241a827018 100644
--- a/src/Core/src/Layouts/GridLayoutManager.cs
+++ b/src/Core/src/Layouts/GridLayoutManager.cs
@@ -2,11 +2,14 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.Maui.Graphics;
+using System.Linq;
 
 namespace Microsoft.Maui.Layouts
 {
 	public class GridLayoutManager : LayoutManager
 	{
+		GridStructure? _gridStructure;
+
 		public GridLayoutManager(IGridLayout layout) : base(layout)
 		{
 			Grid = layout;
@@ -16,17 +19,22 @@ public GridLayoutManager(IGridLayout layout) : base(layout)
 
 		public override Size Measure(double widthConstraint, double heightConstraint)
 		{
-			var structure = new GridStructure(Grid, widthConstraint, heightConstraint);
+			_gridStructure = new GridStructure(Grid, widthConstraint, heightConstraint);
 
-			return new Size(structure.GridWidth(), structure.GridHeight());
+			return new Size(_gridStructure.GridWidth(), _gridStructure.GridHeight());
 		}
 
 		public override void ArrangeChildren(Rectangle childBounds)
 		{
-			var structure = new GridStructure(Grid, childBounds.Width, childBounds.Height);
+			var structure = _gridStructure ?? new GridStructure(Grid, childBounds.Width, childBounds.Height);
 
 			foreach (var view in Grid.Children)
 			{
+				if (view.Visibility == Visibility.Collapsed)
+				{
+					continue;
+				}
+
 				var cell = structure.ComputeFrameFor(view);
 				view.Arrange(cell);
 			}
@@ -40,6 +48,7 @@ class GridStructure
 
 			Row[] _rows { get; }
 			Column[] _columns { get; }
+			IView[] _children;
 			Cell[] _cells { get; }
 
 			readonly Dictionary<SpanKey, Span> _spans = new Dictionary<SpanKey, Span>();
@@ -63,7 +72,10 @@ public GridStructure(IGridLayout grid, double widthConstraint, double heightCons
 					_columns[n] = new Column(_grid.ColumnDefinitions[n]);
 				}
 
-				_cells = new Cell[_grid.Children.Count];
+				_children = _grid.Children.Where(child => child.Visibility != Visibility.Collapsed).ToArray();
+
+				// We'll ignore any collapsed child views during layout
+				_cells = new Cell[_children.Length];
 
 				InitializeCells();
 
@@ -72,9 +84,15 @@ public GridStructure(IGridLayout grid, double widthConstraint, double heightCons
 
 			void InitializeCells()
 			{
-				for (int n = 0; n < _grid.Children.Count; n++)
+				for (int n = 0; n < _children.Length; n++)
 				{
-					var view = _grid.Children[n];
+					var view = _children[n];
+
+					if (view.Visibility == Visibility.Collapsed)
+					{
+						continue;
+					}
+
 					var column = _grid.GetColumn(view);
 					var columnSpan = _grid.GetColumnSpan(view);
 
@@ -179,7 +197,7 @@ void MeasureCells()
 					var availableWidth = _gridWidthConstraint - GridWidth();
 					var availableHeight = _gridHeightConstraint - GridHeight();
 
-					var measure = _grid.Children[cell.ViewIndex].Measure(availableWidth, availableHeight);
+					var measure = _children[cell.ViewIndex].Measure(availableWidth, availableHeight);
 
 					if (cell.IsColumnSpanAuto)
 					{
@@ -316,6 +334,9 @@ double TopEdgeOfRow(int row)
 			}
 		}
 
+		// Dictionary key for tracking a Span
+		record SpanKey(int Start, int Length, bool IsColumn);
+
 		class Span
 		{
 			public int Start { get; }
@@ -336,33 +357,6 @@ public Span(int start, int length, bool isColumn, double value)
 			}
 		}
 
-		class SpanKey
-		{
-			public SpanKey(int start, int length, bool isColumn)
-			{
-				Start = start;
-				Length = length;
-				IsColumn = isColumn;
-			}
-
-			public int Start { get; }
-			public int Length { get; }
-			public bool IsColumn { get; }
-
-			public override bool Equals(object? obj)
-			{
-				return obj is SpanKey key &&
-					   Start == key.Start &&
-					   Length == key.Length &&
-					   IsColumn == key.IsColumn;
-			}
-
-			public override int GetHashCode()
-			{
-				return Start.GetHashCode() ^ Length.GetHashCode() ^ IsColumn.GetHashCode();
-			}
-		}
-
 		class Cell
 		{
 			public int ViewIndex { get; }
diff --git a/src/Core/src/Layouts/HorizontalStackLayoutManager.cs b/src/Core/src/Layouts/HorizontalStackLayoutManager.cs
index c390f1ae2e85..0ad992ea9873 100644
--- a/src/Core/src/Layouts/HorizontalStackLayoutManager.cs
+++ b/src/Core/src/Layouts/HorizontalStackLayoutManager.cs
@@ -12,9 +12,7 @@ public HorizontalStackLayoutManager(IStackLayout layout) : base(layout)
 
 		public override Size Measure(double widthConstraint, double heightConstraint)
 		{
-			var heightMeasureConstraint = ResolveConstraints(heightConstraint, Stack.Height);
-
-			var measure = Measure(heightMeasureConstraint, Stack.Spacing, Stack.Children);
+			var measure = Measure(heightConstraint, Stack.Spacing, Stack.Children);
 
 			var finalWidth = ResolveConstraints(widthConstraint, Stack.Width, measure.Width);
 
@@ -43,6 +41,12 @@ static Size Measure(double heightConstraint, int spacing, IReadOnlyList<IView> v
 			for (int n = 0; n < views.Count; n++)
 			{
 				var child = views[n];
+
+				if (child.Visibility == Visibility.Collapsed)
+				{
+					continue;
+				}
+
 				var measure = child.Measure(double.PositiveInfinity, heightConstraint);
 				totalRequestedWidth += measure.Width;
 				requestedHeight = Math.Max(requestedHeight, measure.Height);
@@ -61,6 +65,12 @@ static void ArrangeLeftToRight(double height, int spacing, IReadOnlyList<IView>
 			for (int n = 0; n < views.Count; n++)
 			{
 				var child = views[n];
+
+				if (child.Visibility == Visibility.Collapsed)
+				{
+					continue;
+				}
+
 				xPosition += ArrangeChild(child, height, spacing, xPosition);
 			}
 		}
@@ -72,6 +82,12 @@ static void ArrangeRightToLeft(double height, int spacing, IReadOnlyList<IView>
 			for (int n = views.Count - 1; n >= 0; n--)
 			{
 				var child = views[n];
+
+				if (child.Visibility == Visibility.Collapsed)
+				{
+					continue;
+				}
+
 				xPostition += ArrangeChild(child, height, spacing, xPostition);
 			}
 		}
diff --git a/src/Core/src/Layouts/LayoutExtensions.cs b/src/Core/src/Layouts/LayoutExtensions.cs
index 92a0f732368f..0e13eee38c9d 100644
--- a/src/Core/src/Layouts/LayoutExtensions.cs
+++ b/src/Core/src/Layouts/LayoutExtensions.cs
@@ -21,10 +21,6 @@ public static Size ComputeDesiredSize(this IFrameworkElement frameworkElement, d
 			widthConstraint -= margin.HorizontalThickness;
 			heightConstraint -= margin.VerticalThickness;
 
-			// Determine whether the external constraints or the requested size values will determine the measurements
-			widthConstraint = LayoutManager.ResolveConstraints(widthConstraint, frameworkElement.Width);
-			heightConstraint = LayoutManager.ResolveConstraints(heightConstraint, frameworkElement.Height);
-
 			// Ask the handler to do the actual measuring								
 			var measureWithMargins = frameworkElement.Handler.GetDesiredSize(widthConstraint, heightConstraint);
 
diff --git a/src/Core/src/Layouts/LayoutManager.cs b/src/Core/src/Layouts/LayoutManager.cs
index 41f234a6d0ca..890939946f39 100644
--- a/src/Core/src/Layouts/LayoutManager.cs
+++ b/src/Core/src/Layouts/LayoutManager.cs
@@ -1,5 +1,4 @@
 using System;
-using Microsoft.Maui;
 using Microsoft.Maui.Graphics;
 
 namespace Microsoft.Maui.Layouts
@@ -16,26 +15,16 @@ public LayoutManager(ILayout layout)
 		public abstract Size Measure(double widthConstraint, double heightConstraint);
 		public abstract void ArrangeChildren(Rectangle childBounds);
 
-		public static double ResolveConstraints(double externalConstraint, double desiredLength)
+		public static double ResolveConstraints(double externalConstraint, double explicitLength, double measuredLength)
 		{
-			if (desiredLength == -1)
-			{
-				return externalConstraint;
-			}
-
-			return Math.Min(externalConstraint, desiredLength);
-		}
-
-		public static double ResolveConstraints(double externalConstraint, double desiredLength, double measuredLength)
-		{
-			if (desiredLength == -1)
+			if (explicitLength == -1)
 			{
 				// No user-specified length, so the measured value will be limited by the external constraint
 				return Math.Min(measuredLength, externalConstraint);
 			}
 
 			// User-specified length wins, subject to external constraints
-			return Math.Min(desiredLength, externalConstraint);
+			return Math.Min(explicitLength, externalConstraint);
 		}
 	}
 }
diff --git a/src/Core/src/Layouts/VerticalStackLayoutManager.cs b/src/Core/src/Layouts/VerticalStackLayoutManager.cs
index a5b47f4aaeb0..79d6ac3850fb 100644
--- a/src/Core/src/Layouts/VerticalStackLayoutManager.cs
+++ b/src/Core/src/Layouts/VerticalStackLayoutManager.cs
@@ -12,9 +12,7 @@ public VerticalStackLayoutManager(IStackLayout stackLayout) : base(stackLayout)
 
 		public override Size Measure(double widthConstraint, double heightConstraint)
 		{
-			var widthMeasureConstraint = ResolveConstraints(widthConstraint, Stack.Width);
-
-			var measure = Measure(widthMeasureConstraint, Stack.Spacing, Stack.Children);
+			var measure = Measure(widthConstraint, Stack.Spacing, Stack.Children);
 
 			var finalHeight = ResolveConstraints(heightConstraint, Stack.Height, measure.Height);
 
@@ -30,6 +28,11 @@ static Size Measure(double widthConstraint, int spacing, IReadOnlyList<IView> vi
 
 			foreach (var child in views)
 			{
+				if (child.Visibility == Visibility.Collapsed)
+				{
+					continue;
+				}
+
 				var measure = child.Measure(widthConstraint, double.PositiveInfinity);
 				totalRequestedHeight += measure.Height;
 				requestedWidth = Math.Max(requestedWidth, measure.Width);
@@ -47,6 +50,11 @@ static void Arrange(double width, int spacing, IEnumerable<IView> views)
 
 			foreach (var child in views)
 			{
+				if (child.Visibility == Visibility.Collapsed)
+				{
+					continue;
+				}
+
 				var destination = new Rectangle(0, stackHeight, width, child.DesiredSize.Height);
 				child.Arrange(destination);
 				stackHeight += destination.Height + spacing;
diff --git a/src/Core/src/Platform/Android/ActivityIndicatorExtensions.cs b/src/Core/src/Platform/Android/ActivityIndicatorExtensions.cs
index 24e910a84f16..b86928d01a24 100644
--- a/src/Core/src/Platform/Android/ActivityIndicatorExtensions.cs
+++ b/src/Core/src/Platform/Android/ActivityIndicatorExtensions.cs
@@ -5,8 +5,17 @@ namespace Microsoft.Maui
 {
 	public static class ActivityIndicatorExtensions
 	{
-		public static void UpdateIsRunning(this ProgressBar progressBar, IActivityIndicator activityIndicator) =>
-			progressBar.Visibility = activityIndicator.IsRunning ? ViewStates.Visible : ViewStates.Invisible;
+		public static void UpdateIsRunning(this ProgressBar progressBar, IActivityIndicator activityIndicator)
+		{
+			if (activityIndicator.Visibility == Visibility.Visible)
+			{
+				progressBar.Visibility = activityIndicator.IsRunning ? ViewStates.Visible : ViewStates.Invisible;
+			}
+			else
+			{
+				progressBar.Visibility = activityIndicator.Visibility.ToNativeVisibility();
+			}
+		}
 
 		public static void UpdateColor(this ProgressBar progressBar, IActivityIndicator activityIndicator)
 		{
diff --git a/src/Core/src/Platform/Android/AspectExtensions.cs b/src/Core/src/Platform/Android/AspectExtensions.cs
new file mode 100644
index 000000000000..e43166962e39
--- /dev/null
+++ b/src/Core/src/Platform/Android/AspectExtensions.cs
@@ -0,0 +1,22 @@
+using Android.Widget;
+
+namespace Microsoft.Maui
+{
+	public static class AspectExtensions
+	{
+		static ImageView.ScaleType? AspectFit;
+		static ImageView.ScaleType? AspectFill;
+		static ImageView.ScaleType? Fill;
+		static ImageView.ScaleType? Center;
+
+		public static ImageView.ScaleType ToScaleType(this Aspect aspect) =>
+			aspect switch
+			{
+				Aspect.AspectFit => AspectFit ??= ImageView.ScaleType.FitCenter!,
+				Aspect.AspectFill => AspectFill ??= ImageView.ScaleType.CenterCrop!,
+				Aspect.Fill => Fill ??= ImageView.ScaleType.FitXy!,
+				Aspect.Center => Center ??= ImageView.ScaleType.Center!,
+				_ => AspectFit ??= ImageView.ScaleType.FitCenter!,
+			};
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Platform/Android/CheckBoxExtensions.cs b/src/Core/src/Platform/Android/CheckBoxExtensions.cs
index bf8820c6d565..fdfe5eac245b 100644
--- a/src/Core/src/Platform/Android/CheckBoxExtensions.cs
+++ b/src/Core/src/Platform/Android/CheckBoxExtensions.cs
@@ -1,29 +1,19 @@
-using Android.Content.Res;
-using Android.Graphics;
-using AndroidX.AppCompat.Widget;
-using AndroidX.Core.Widget;
-using AAttribute = Android.Resource.Attribute;
+using AndroidX.AppCompat.Widget;
+using Microsoft.Maui.Graphics;
 using AColor = Android.Graphics.Color;
-using XColor = Microsoft.Maui.Graphics.Color;
 
 namespace Microsoft.Maui
 {
 	public static class CheckBoxExtensions
 	{
-		static readonly int[][] CheckedStates = new int[][]
+		public static void UpdateBackground(this AppCompatCheckBox nativeCheckBox, ICheckBox check)
 		{
-			new int[] { AAttribute.StateEnabled, AAttribute.StateChecked },
-			new int[] { AAttribute.StateEnabled, -AAttribute.StateChecked },
-			new int[] { -AAttribute.StateEnabled, AAttribute.StateChecked },
-			new int[] { -AAttribute.StateEnabled, -AAttribute.StatePressed },
-		};
+			var paint = check.Background;
 
-		public static void UpdateBackgroundColor(this AppCompatCheckBox nativeCheckBox, ICheckBox check)
-		{
-			if (check.BackgroundColor == null)
+			if (paint.IsNullOrEmpty())
 				nativeCheckBox.SetBackgroundColor(AColor.Transparent);
 			else
-				nativeCheckBox.SetBackgroundColor(check.BackgroundColor.ToNative());
+				nativeCheckBox.UpdateBackground((IView)check);
 		}
 
 		public static void UpdateIsChecked(this AppCompatCheckBox nativeCheckBox, ICheckBox check)
diff --git a/src/Core/src/Platform/Android/ContainerView.cs b/src/Core/src/Platform/Android/ContainerView.cs
index c1ebf84aba77..12a6bff52872 100644
--- a/src/Core/src/Platform/Android/ContainerView.cs
+++ b/src/Core/src/Platform/Android/ContainerView.cs
@@ -5,8 +5,8 @@
 using Android.Views;
 using Android.Widget;
 using AndroidX.Fragment.App;
-using AView = Android.Views.View;
 using Microsoft.Maui.HotReload;
+using AView = Android.Views.View;
 
 namespace Microsoft.Maui
 {
diff --git a/src/Core/src/Platform/Android/ContextExtensions.cs b/src/Core/src/Platform/Android/ContextExtensions.cs
index a0b9e912510a..93695ddfe520 100644
--- a/src/Core/src/Platform/Android/ContextExtensions.cs
+++ b/src/Core/src/Platform/Android/ContextExtensions.cs
@@ -1,6 +1,8 @@
 using System;
+using System.IO;
 using System.Runtime.CompilerServices;
 using Android.Content;
+using Android.Content.Res;
 using Android.OS;
 using Android.Util;
 using Android.Views.InputMethods;
@@ -12,6 +14,7 @@
 using AColor = Android.Graphics.Color;
 using AFragmentManager = AndroidX.Fragment.App.FragmentManager;
 using Size = Microsoft.Maui.Graphics.Size;
+
 namespace Microsoft.Maui
 {
 	public static class ContextExtensions
@@ -74,7 +77,7 @@ public static bool HasRtlSupport(this Context self)
 			return (int?)self?.ApplicationInfo?.TargetSdkVersion;
 		}
 
-		internal static double GetThemeAttributeDp(this Context self, int resource)
+		public static double GetThemeAttributeDp(this Context self, int resource)
 		{
 			using (var value = new TypedValue())
 			{
@@ -90,6 +93,20 @@ internal static double GetThemeAttributeDp(this Context self, int resource)
 			}
 		}
 
+		public static double GetThemeAttributePixels(this Context self, int resource)
+		{
+			using (var value = new TypedValue())
+			{
+				if (self == null || self.Theme == null)
+					return -1;
+
+				if (!self.Theme.ResolveAttribute(resource, value, true))
+					return -1;
+
+				return (double)TypedValue.ComplexToDimension(value.Data, self.Resources?.DisplayMetrics);
+			}
+		}
+
 		internal static int GetDisabledThemeAttrColor(this Context context, int attr)
 		{
 			if (context.Theme == null)
@@ -104,6 +121,10 @@ internal static int GetDisabledThemeAttrColor(this Context context, int attr)
 			}
 		}
 
+		public static bool TryResolveAttribute(this Context context, int id)
+		{
+			return context.Theme.TryResolveAttribute(id);
+		}
 
 		internal static int GetThemeAttrColor(this Context context, int attr)
 		{
@@ -179,7 +200,7 @@ static void EnsureMetrics(Context context)
 			return null;
 		}
 
-		public static AFragmentManager? GetFragmentManager(this Context context)
+		public static FragmentManager? GetFragmentManager(this Context context)
 		{
 			if (context == null)
 				return null;
@@ -191,5 +212,25 @@ static void EnsureMetrics(Context context)
 
 			return null;
 		}
+
+		public static int GetDrawableId(this Context context, string name)
+		{
+			if (context.Resources == null || context.PackageName == null)
+				return 0;
+
+			return context.Resources.GetDrawableId(context.PackageName, name);
+		}
+
+		public static int GetDrawableId(this Resources resources, string packageName, string name)
+		{
+			if (string.IsNullOrWhiteSpace(name))
+				return 0;
+
+			var title = Path.GetFileNameWithoutExtension(name);
+
+			title = title.ToLowerInvariant();
+
+			return resources.GetIdentifier(title, "drawable", packageName);
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Platform/Android/FutureExtensions.cs b/src/Core/src/Platform/Android/FutureExtensions.cs
new file mode 100644
index 000000000000..68019a61ee88
--- /dev/null
+++ b/src/Core/src/Platform/Android/FutureExtensions.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Java.Util.Concurrent;
+
+namespace Microsoft.Maui
+{
+	public static class FutureExtensions
+	{
+		public static Task<Java.Lang.Object?> AsTask(this IFuture future, CancellationToken cancellationToken = default) =>
+			future.AsTask<Java.Lang.Object>(cancellationToken);
+
+		public static Task<TResult?> AsTask<TResult>(this IFuture future, CancellationToken cancellationToken = default)
+			where TResult : Java.Lang.Object
+		{
+			cancellationToken.Register(() => future.Cancel(true));
+
+			return Task.Run(() =>
+			{
+				try
+				{
+					var obj = future.Get();
+
+					if (future.IsCancelled || cancellationToken.IsCancellationRequested)
+						throw new OperationCanceledException();
+
+					return (TResult?)obj;
+				}
+				catch (CancellationException)
+				{
+					throw new OperationCanceledException();
+				}
+			});
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Platform/Android/HandlerExtensions.cs b/src/Core/src/Platform/Android/HandlerExtensions.cs
index 4f53e329a74b..6102a5ecdb65 100644
--- a/src/Core/src/Platform/Android/HandlerExtensions.cs
+++ b/src/Core/src/Platform/Android/HandlerExtensions.cs
@@ -18,9 +18,15 @@ public static AView ToNative(this IView view, IMauiContext context)
 
 			var handler = view.Handler;
 
-			if (handler == null)
+			if (handler?.MauiContext != null &&
+				handler.MauiContext != context)
 			{
+				view.Handler = null;
+				handler = null;
+			}
 
+			if (handler == null)
+			{
 				handler = context.Handlers.GetHandler(view.GetType());
 
 				if (handler == null)
diff --git a/src/Core/src/Platform/Android/ImageViewExtensions.cs b/src/Core/src/Platform/Android/ImageViewExtensions.cs
new file mode 100644
index 000000000000..49ada5935da8
--- /dev/null
+++ b/src/Core/src/Platform/Android/ImageViewExtensions.cs
@@ -0,0 +1,105 @@
+#nullable enable
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Android.Graphics.Drawables;
+using Android.Widget;
+
+namespace Microsoft.Maui
+{
+	public static class ImageViewExtensions
+	{
+		public static void Clear(this ImageView imageView)
+		{
+			// stop the animation
+			if (imageView.Drawable is IAnimatable animatable)
+				animatable.Stop();
+
+			// clear the view and release any bitmaps
+			imageView.SetImageResource(global::Android.Resource.Color.Transparent);
+		}
+
+		public static void UpdateAspect(this ImageView imageView, IImage image)
+		{
+			imageView.SetScaleType(image.Aspect.ToScaleType());
+		}
+
+		public static void UpdateIsAnimationPlaying(this ImageView imageView, IImageSourcePart image)
+		{
+			if (imageView.Drawable is IAnimatable animatable)
+			{
+				if (image.IsAnimationPlaying)
+				{
+					if (!animatable.IsRunning)
+						animatable.Start();
+				}
+				else
+				{
+					if (animatable.IsRunning)
+						animatable.Stop();
+				}
+			}
+		}
+
+		public static async Task<IImageSourceServiceResult<Drawable>?> UpdateSourceAsync(this ImageView imageView, IImageSourcePart image, IImageSourceServiceProvider services, CancellationToken cancellationToken = default)
+		{
+			imageView.Clear();
+
+			image.UpdateIsLoading(false);
+
+			var context = imageView.Context;
+			if (context == null)
+				return null;
+
+			var imageSource = image.Source;
+			if (imageSource == null)
+				return null;
+
+			var events = image as IImageSourcePartEvents;
+
+			events?.LoadingStarted();
+			image.UpdateIsLoading(true);
+
+			try
+			{
+				var service = services.GetRequiredImageSourceService(imageSource);
+
+				var result = await service.GetDrawableAsync(imageSource, context, cancellationToken);
+				var drawable = result?.Value;
+
+				var applied = !cancellationToken.IsCancellationRequested && imageView.IsAlive() && imageSource == image.Source;
+
+				// only set the image if we are still on the same one
+				if (applied)
+				{
+					imageView.SetImageDrawable(drawable);
+
+					imageView.UpdateIsAnimationPlaying(image);
+				}
+
+				events?.LoadingCompleted(applied);
+
+				return result;
+			}
+			catch (OperationCanceledException)
+			{
+				// no-op
+				events?.LoadingCompleted(false);
+			}
+			catch (Exception ex)
+			{
+				events?.LoadingFailed(ex);
+			}
+			finally
+			{
+				// only mark as finished if we are still working on the same image
+				if (imageSource == image.Source)
+				{
+					image.UpdateIsLoading(false);
+				}
+			}
+
+			return null;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Platform/Android/JavaObjectExtensions.cs b/src/Core/src/Platform/Android/JavaObjectExtensions.cs
index 2bb211149e46..7b0a81c8f1c6 100644
--- a/src/Core/src/Platform/Android/JavaObjectExtensions.cs
+++ b/src/Core/src/Platform/Android/JavaObjectExtensions.cs
@@ -1,17 +1,15 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
-namespace Microsoft.Maui.Handlers
+namespace Microsoft.Maui
 {
-	public static class JavaObjectExtensions
+	static class JavaObjectExtensions
 	{
-		static bool IsDisposed(this Java.Lang.Object obj)
+		public static bool IsDisposed(this Java.Lang.Object obj)
 		{
 			return obj.Handle == IntPtr.Zero;
 		}
 
-		static bool IsDisposed(this global::Android.Runtime.IJavaObject obj)
+		public static bool IsDisposed(this global::Android.Runtime.IJavaObject obj)
 		{
 			return obj.Handle == IntPtr.Zero;
 		}
@@ -32,4 +30,4 @@ public static bool IsAlive(this global::Android.Runtime.IJavaObject? obj)
 			return !obj.IsDisposed();
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/src/Core/src/Platform/Android/MauiAppCompatActivity.cs b/src/Core/src/Platform/Android/MauiAppCompatActivity.cs
index 41b3aaa98147..fe70cb22aa75 100644
--- a/src/Core/src/Platform/Android/MauiAppCompatActivity.cs
+++ b/src/Core/src/Platform/Android/MauiAppCompatActivity.cs
@@ -4,6 +4,7 @@
 using AndroidX.AppCompat.App;
 using AndroidX.AppCompat.Widget;
 using AndroidX.CoordinatorLayout.Widget;
+using AndroidX.Navigation.UI;
 using Google.Android.Material.AppBar;
 
 namespace Microsoft.Maui
@@ -13,9 +14,9 @@ public partial class MauiAppCompatActivity : AppCompatActivity
 		protected override void OnCreate(Bundle? savedInstanceState)
 		{
 			// If the theme has the maui_splash attribute, change the theme
-			if (Theme != null && Theme.ResolveAttribute(Resource.Attribute.maui_splash, new Android.Util.TypedValue(), resolveRefs: true))
+			if (Theme.TryResolveAttribute(Resource.Attribute.maui_splash))
 			{
-				SetTheme(Resource.Style.Maui_MainTheme);
+				SetTheme(Resource.Style.Maui_MainTheme_NoActionBar);
 			}
 
 			base.OnCreate(savedInstanceState);
@@ -28,46 +29,34 @@ protected override void OnCreate(Bundle? savedInstanceState)
 			if (mauiApp == null)
 				throw new InvalidOperationException($"The {nameof(IServiceProvider)} instance was not found.");
 
-			var mauiContext = new MauiContext(services, this);
+			MauiContext mauiContext;
+			IWindow window;
 
-			var state = new ActivationState(mauiContext, savedInstanceState);
-			var window = mauiApp.CreateWindow(state);
-			window.MauiContext = mauiContext;
-
-			//var matchParent = ViewGroup.LayoutParams.MatchParent;
-			var wrap = ViewGroup.LayoutParams.WrapContent;
-
-			// Create the root native layout and set the Activity's content to it
-			//var nativeRootLayout = new CoordinatorLayout(this);
-			var nativeRootLayout = new LinearLayoutCompat(this);
-			SetContentView(nativeRootLayout, new ViewGroup.LayoutParams(wrap, wrap));
-
-			//AddToolbar(parent);
-
-			var page = window.Page;
-
-			// This currently relies on IPage : IView, which may not exactly be right
-			// we may have to add another handler extension that works for Page
-			// Also, AbstractViewHandler is set to work for IView (obviously); if IPage is not IView,
-			// then we'll need to change it to AbstractFrameworkElementHandler or create a separate
-			// abstract handler for IPage
-			// TODO ezhart Think about all this stuff ^^
-
-			var nativePage = page.ToContainerView(window.MauiContext);
-
-			// Add the IPage to the root layout; use match parent so the page automatically has the dimensions of the activity
-			// nativeRootLayout.AddView(nativePage, new CoordinatorLayout.LayoutParams(wrap, wrap));
-			nativeRootLayout.AddView(nativePage, new LinearLayoutCompat.LayoutParams(wrap, wrap));
-		}
+			// TODO Fix once we have multiple windows
+			if (mauiApp.Windows.Count > 0)
+			{
+				window = mauiApp.Windows[0];
+				mauiContext = new MauiContext(services, this);
+			}
+			else
+			{
+				mauiContext = new MauiContext(services, this);
+				ActivationState state = new ActivationState(mauiContext, savedInstanceState);
+				window = mauiApp.CreateWindow(state);
+			}
 
-		void AddToolbar(ViewGroup parent)
-		{
-			Toolbar toolbar = new Toolbar(this);
-			var appbarLayout = new AppBarLayout(this);
+			SetContentView(window.View.ToNative(mauiContext));
 
-			appbarLayout.AddView(toolbar, new ViewGroup.LayoutParams(AppBarLayout.LayoutParams.MatchParent, global::Android.Resource.Attribute.ActionBarSize));
-			SetSupportActionBar(toolbar);
-			parent.AddView(appbarLayout, new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MatchParent, ViewGroup.LayoutParams.WrapContent));
+			//TODO MAUI
+			// Allow users to customize the toolbarid?
+			bool? windowActionBar;
+			if (Theme.TryResolveAttribute(Resource.Attribute.windowActionBar, out windowActionBar) &&
+				windowActionBar == false)
+			{
+				var toolbar = FindViewById<Toolbar>(Resource.Id.maui_toolbar);
+				if (toolbar != null)
+					SetSupportActionBar(toolbar);
+			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Core/src/Platform/Android/MauiContext.cs b/src/Core/src/Platform/Android/MauiContext.cs
index 6e0530f2c07a..5dfad2c55f5b 100644
--- a/src/Core/src/Platform/Android/MauiContext.cs
+++ b/src/Core/src/Platform/Android/MauiContext.cs
@@ -6,23 +6,34 @@ namespace Microsoft.Maui
 {
 	public class MauiContext : IMauiContext
 	{
-		readonly Context _context;
+		readonly WeakReference<Context> _context;
 		readonly IServiceProvider? _services;
 		readonly IMauiHandlersServiceProvider? _mauiHandlersServiceProvider;
 
 		public MauiContext(Context context)
 		{
-			_context = context ?? throw new ArgumentNullException(nameof(context));
+			_context = new WeakReference<Context>(context ?? throw new ArgumentNullException(nameof(context)));
 		}
 
-		public MauiContext(IServiceProvider services, Context context)
+		public MauiContext(IServiceProvider services, Context context) : this(context)
 		{
 			_services = services ?? throw new ArgumentNullException(nameof(services));
-			_context = context ?? throw new ArgumentNullException(nameof(context));
 			_mauiHandlersServiceProvider = Services.GetRequiredService<IMauiHandlersServiceProvider>();
 		}
 
-		public Context Context => _context;
+		public Context? Context
+		{
+			get
+			{
+				Context? context;
+				if (_context.TryGetTarget(out context))
+				{
+					return context;
+				}
+
+				return null;
+			}
+		}
 
 		public IServiceProvider Services =>
 			_services ?? throw new InvalidOperationException($"No service provider was specified during construction.");
diff --git a/src/Core/src/Platform/Android/MauiDatePicker.cs b/src/Core/src/Platform/Android/MauiDatePicker.cs
index 1a2b1b1cdca9..bef4f8aa121f 100644
--- a/src/Core/src/Platform/Android/MauiDatePicker.cs
+++ b/src/Core/src/Platform/Android/MauiDatePicker.cs
@@ -50,6 +50,7 @@ protected override void OnFocusChanged(bool gainFocus, [GeneratedEnum] FocusSear
 			}
 		}
 
+
 		void Initialize()
 		{
 			DrawableCompat.Wrap(Background);
diff --git a/src/Core/src/Platform/Android/NavigationLayout.cs b/src/Core/src/Platform/Android/NavigationLayout.cs
new file mode 100644
index 000000000000..8f82daf69cba
--- /dev/null
+++ b/src/Core/src/Platform/Android/NavigationLayout.cs
@@ -0,0 +1,31 @@
+using System;
+using Android.Content;
+using Android.Runtime;
+using Android.Util;
+using AndroidX.CoordinatorLayout.Widget;
+
+namespace Microsoft.Maui
+{
+	public class NavigationLayout : CoordinatorLayout
+	{
+		[Preserve(Conditional = true)]
+		public NavigationLayout(Context context) : base(context)
+		{
+		}
+
+		[Preserve(Conditional = true)]
+		public NavigationLayout(Context context, IAttributeSet attrs) : base(context, attrs)
+		{
+		}
+
+		[Preserve(Conditional = true)]
+		public NavigationLayout(Context context, IAttributeSet attrs, int defStyleAttr) : base(context, attrs, defStyleAttr)
+		{
+		}
+
+		[Preserve(Conditional = true)]
+		protected NavigationLayout(IntPtr javaReference, JniHandleOwnership transfer) : base(javaReference, transfer)
+		{
+		}
+	}
+}
diff --git a/src/Core/src/Platform/Android/PickerExtensions.cs b/src/Core/src/Platform/Android/PickerExtensions.cs
index 2c09a1e9ff4d..c18cc857f00d 100644
--- a/src/Core/src/Platform/Android/PickerExtensions.cs
+++ b/src/Core/src/Platform/Android/PickerExtensions.cs
@@ -12,35 +12,10 @@ internal static void UpdatePicker(this MauiPicker nativePicker, IPicker picker)
 		{
 			nativePicker.Hint = picker.Title;
 
-			if (picker.SelectedIndex == -1 || picker.Items == null || picker.SelectedIndex >= picker.Items.Count)
+			if (picker.SelectedIndex == -1 || picker.SelectedIndex >= picker.GetCount())
 				nativePicker.Text = null;
 			else
-				nativePicker.Text = picker.Items[picker.SelectedIndex];
-
-			nativePicker.SetSelectedItem(picker);
-		}
-
-		internal static void SetSelectedItem(this MauiPicker nativePicker, IPicker picker)
-		{
-			if (picker == null || nativePicker == null)
-				return;
-
-			int index = picker.SelectedIndex;
-
-			if (index == -1)
-			{
-				picker.SelectedItem = null;
-				return;
-			}
-
-			if (picker.ItemsSource != null)
-			{
-				picker.SelectedItem = picker.ItemsSource[index];
-				return;
-			}
-
-			if (picker.Items != null)
-				picker.SelectedItem = picker.Items[index];
+				nativePicker.Text = picker.GetItem(picker.SelectedIndex);
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Platform/Android/Resources/Layout/activity_main.xml b/src/Core/src/Platform/Android/Resources/Layout/activity_main.xml
deleted file mode 100644
index 1bd8ea1ae83e..000000000000
--- a/src/Core/src/Platform/Android/Resources/Layout/activity_main.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent">
-    <com.google.android.material.appbar.AppBarLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:theme="@style/Maui.MainTheme.AppBarOverlay">
-        <androidx.appcompat.widget.Toolbar android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" android:background="?attr/colorPrimary" app:popupTheme="@style/Maui.MainTheme.PopupOverlay" />
-    </com.google.android.material.appbar.AppBarLayout>
-    <include layout="@layout/content_main" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/src/Core/src/Platform/Android/Resources/Layout/content_main.xml b/src/Core/src/Platform/Android/Resources/Layout/content_main.xml
deleted file mode 100644
index a9e808439fee..000000000000
--- a/src/Core/src/Platform/Android/Resources/Layout/content_main.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<androidx.core.widget.NestedScrollView
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:id="@+id/Page"
-  android:orientation="vertical"
-  android:layout_width="match_parent"
-  app:layout_behavior="@string/appbar_scrolling_view_behavior"
-  android:layout_height="match_parent">
-</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/src/Core/src/Platform/Android/Resources/Layout/navigationlayout.axml b/src/Core/src/Platform/Android/Resources/Layout/navigationlayout.axml
new file mode 100644
index 000000000000..baffc2fc3597
--- /dev/null
+++ b/src/Core/src/Platform/Android/Resources/Layout/navigationlayout.axml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<microsoft.maui.NavigationLayout
+		xmlns:android="http://schemas.android.com/apk/res/android"
+		xmlns:app="http://schemas.android.com/apk/res-auto"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		>
+
+    <com.google.android.material.appbar.AppBarLayout
+			android:id="@+id/appbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+			android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+				>
+
+
+
+        <androidx.appcompat.widget.Toolbar
+				android:id="@+id/maui.toolbar"
+				android:layout_width="match_parent"
+				android:layout_height="?attr/actionBarSize"
+				app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.fragment.app.FragmentContainerView
+            android:id="@+id/nav_host"
+            android:name="androidx.navigation.fragment.NavHostFragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:defaultNavHost="true"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior"
+            />
+</microsoft.maui.NavigationLayout>
\ No newline at end of file
diff --git a/src/Core/src/Platform/Android/SwitchExtensions.cs b/src/Core/src/Platform/Android/SwitchExtensions.cs
index 3aeb30ada01c..0c72c24a421e 100644
--- a/src/Core/src/Platform/Android/SwitchExtensions.cs
+++ b/src/Core/src/Platform/Android/SwitchExtensions.cs
@@ -103,6 +103,5 @@ public static ColorStateList GetDefaultSwitchThumbColorStateList(this ASwitch aS
 			new int[] { AAttribute.StateChecked },
 			new int[0],
 		};
-
 	}
 }
diff --git a/src/Core/src/Platform/Android/TextViewExtensions.cs b/src/Core/src/Platform/Android/TextViewExtensions.cs
index 5efba12d4d7d..8af40b4f7091 100644
--- a/src/Core/src/Platform/Android/TextViewExtensions.cs
+++ b/src/Core/src/Platform/Android/TextViewExtensions.cs
@@ -44,7 +44,7 @@ public static void UpdateFont(this TextView textView, ITextStyle textStyle, IFon
 			var tf = fontManager.GetTypeface(font);
 			textView.Typeface = tf;
 
-			var sp = fontManager.GetScaledPixel(font);
+			var sp = fontManager.GetFontSize(font);
 			textView.SetTextSize(ComplexUnitType.Sp, sp);
 		}
 
diff --git a/src/Core/src/Platform/Android/ThemeExtensions.cs b/src/Core/src/Platform/Android/ThemeExtensions.cs
new file mode 100644
index 000000000000..86f071a42452
--- /dev/null
+++ b/src/Core/src/Platform/Android/ThemeExtensions.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Android.Content.Res;
+
+namespace Microsoft.Maui
+{
+	public static class ThemeExtensions
+	{
+		public static bool TryResolveAttribute(this Resources.Theme? theme, int id)
+		{
+			return theme != null && theme.ResolveAttribute(id, new Android.Util.TypedValue(), resolveRefs: true);
+		}
+
+		public static bool TryResolveAttribute(this Resources.Theme? theme, int id, out bool? value)
+		{
+			using (var tv = new Android.Util.TypedValue())
+			{
+				if (theme != null && theme.ResolveAttribute(id, tv, resolveRefs: true))
+				{
+					if (tv.Data == 0)
+						value = false;
+					else
+						value = true;
+
+					return true;
+				}
+			}
+
+			value = null;
+			return false;
+		}
+	}
+}
diff --git a/src/Core/src/Platform/Android/ViewExtensions.cs b/src/Core/src/Platform/Android/ViewExtensions.cs
index d14bbc4f06b3..a0dd992c3c50 100644
--- a/src/Core/src/Platform/Android/ViewExtensions.cs
+++ b/src/Core/src/Platform/Android/ViewExtensions.cs
@@ -1,4 +1,6 @@
+using Android.Views;
 using AndroidX.Core.View;
+using Microsoft.Maui.Graphics;
 using AView = Android.Views.View;
 
 namespace Microsoft.Maui
@@ -14,11 +16,39 @@ public static void UpdateIsEnabled(this AView nativeView, IView view)
 				nativeView.Enabled = view.IsEnabled;
 		}
 
-		public static void UpdateBackgroundColor(this AView nativeView, IView view)
+		public static void UpdateVisibility(this AView nativeView, IView view)
 		{
-			var backgroundColor = view.BackgroundColor;
-			if (backgroundColor != null)
-				nativeView?.SetBackgroundColor(backgroundColor.ToNative());
+			nativeView.Visibility = view.Visibility.ToNativeVisibility();
+		}
+
+		public static ViewStates ToNativeVisibility(this Visibility visibility) 
+		{
+			return visibility switch
+			{
+				Visibility.Hidden => ViewStates.Invisible,
+				Visibility.Collapsed => ViewStates.Gone,
+				_ => ViewStates.Visible,
+			};
+		}
+
+		public static void UpdateBackground(this AView nativeView, IView view)
+		{
+			if (view == null)
+				return;
+
+			// Remove previous background gradient if any
+			if (nativeView.Background is MauiDrawable mauiDrawable)
+			{
+				nativeView.Background = null;
+				mauiDrawable.Dispose();
+			}
+
+			var paint = view.Background;
+
+			if (paint.IsNullOrEmpty())
+				return;
+
+			nativeView.Background = paint?.ToDrawable();
 		}
 
 		public static bool GetClipToOutline(this AView view)
@@ -35,7 +65,7 @@ public static void UpdateAutomationId(this AView nativeView, IView view)
 		{
 			if (AutomationTagId == DefaultAutomationTagId)
 			{
-				AutomationTagId = Microsoft.Maui.Resource.Id.automation_tag_id;
+				AutomationTagId = Resource.Id.automation_tag_id;
 			}
 
 			nativeView.SetTag(AutomationTagId, view.AutomationId);
@@ -44,11 +74,35 @@ public static void UpdateAutomationId(this AView nativeView, IView view)
 		public static void UpdateSemantics(this AView nativeView, IView view)
 		{
 			var semantics = view.Semantics;
+
 			if (semantics == null)
 				return;
 
 			nativeView.ContentDescription = semantics.Description;
 			ViewCompat.SetAccessibilityHeading(nativeView, semantics.IsHeading);
 		}
+
+		public static void InvalidateMeasure(this AView nativeView, IView view)
+		{
+			nativeView.RequestLayout();
+		}
+
+		public static void UpdateWidth(this AView nativeView, IView view)
+		{
+			// GetDesiredSize will take the specified Width into account during the layout
+			if (!nativeView.IsInLayout)
+			{
+				nativeView.RequestLayout();
+			}
+		}
+
+		public static void UpdateHeight(this AView nativeView, IView view)
+		{
+			// GetDesiredSize will take the specified Height into account during the layout
+			if (!nativeView.IsInLayout)
+			{
+				nativeView.RequestLayout();
+			}
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Platform/IMauiContext.cs b/src/Core/src/Platform/IMauiContext.cs
index 325d7ae87ce6..a1bb999e9d68 100644
--- a/src/Core/src/Platform/IMauiContext.cs
+++ b/src/Core/src/Platform/IMauiContext.cs
@@ -9,7 +9,7 @@ public interface IMauiContext
 		IMauiHandlersServiceProvider Handlers { get; }
 
 #if __ANDROID__
-		global::Android.Content.Context Context { get; }
+		global::Android.Content.Context? Context { get; }
 #elif __IOS__
 
 #endif
diff --git a/src/Core/src/Platform/Standard/ViewExtensions.cs b/src/Core/src/Platform/Standard/ViewExtensions.cs
index 1d42c3ed45bf..3caf5a909b97 100644
--- a/src/Core/src/Platform/Standard/ViewExtensions.cs
+++ b/src/Core/src/Platform/Standard/ViewExtensions.cs
@@ -4,10 +4,18 @@ static class ViewExtensions
 	{
 		public static void UpdateIsEnabled(this object nativeView, IView view) { }
 
-		public static void UpdateBackgroundColor(this object nativeView, IView view) { }
+		public static void UpdateVisibility(this object nativeView, IView view) { }
+
+		public static void UpdateBackground(this object nativeView, IView view) { }
 
 		public static void UpdateAutomationId(this object nativeView, IView view) { }
 
 		public static void UpdateSemantics(this object nativeView, IView view) { }
+
+		public static void InvalidateMeasure(this object nativeView, IView view) { }
+
+		public static void UpdateWidth(this object nativeView, IView view) { }
+
+		public static void UpdateHeight(this object nativeView, IView view) { }
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Platform/ViewHandlerExtensions.cs b/src/Core/src/Platform/ViewHandlerExtensions.cs
index e8178dc61d9c..77d0aec17d52 100644
--- a/src/Core/src/Platform/ViewHandlerExtensions.cs
+++ b/src/Core/src/Platform/ViewHandlerExtensions.cs
@@ -1,13 +1,14 @@
+#nullable enable
+
 using System;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Maui.Handlers;
 
 namespace Microsoft.Maui
 {
-	internal static class ViewHandlerExtensions
+	static class ViewHandlerExtensions
 	{
-		public static T GetRequiredService<T>(this ViewHandler handler)
-			where T : notnull
+		public static IServiceProvider GetServiceProvider(this ViewHandler handler)
 		{
 			var context = handler.MauiContext ??
 				throw new InvalidOperationException($"Unable to find the context. The {nameof(ViewHandler.MauiContext)} property should have been set by the host.");
@@ -15,6 +16,42 @@ public static T GetRequiredService<T>(this ViewHandler handler)
 			var services = context?.Services ??
 				throw new InvalidOperationException($"Unable to find the service provider. The {nameof(ViewHandler.MauiContext)} property should have been set by the host.");
 
+			return services;
+		}
+
+		public static T? GetService<T>(this ViewHandler handler, Type type)
+		{
+			var services = handler.GetServiceProvider();
+
+			var service = services.GetService(type);
+
+			return (T?)service;
+		}
+
+		public static T? GetService<T>(this ViewHandler handler)
+		{
+			var services = handler.GetServiceProvider();
+
+			var service = services.GetService<T>();
+
+			return service;
+		}
+
+		public static T GetRequiredService<T>(this ViewHandler handler, Type type)
+			where T : notnull
+		{
+			var services = handler.GetServiceProvider();
+
+			var service = services.GetRequiredService(type);
+
+			return (T)service;
+		}
+
+		public static T GetRequiredService<T>(this ViewHandler handler)
+			where T : notnull
+		{
+			var services = handler.GetServiceProvider();
+
 			var service = services.GetRequiredService<T>();
 
 			return service;
diff --git a/src/Core/src/Platform/Windows/AlignmentExtensions.cs b/src/Core/src/Platform/Windows/AlignmentExtensions.cs
new file mode 100644
index 000000000000..cfbc584306bb
--- /dev/null
+++ b/src/Core/src/Platform/Windows/AlignmentExtensions.cs
@@ -0,0 +1,20 @@
+using Microsoft.UI.Xaml;
+
+namespace Microsoft.Maui
+{
+	public static class AlignmentExtensions
+	{
+		public static HorizontalAlignment ToNativeHorizontalAlignment(this TextAlignment alignment)
+		{
+			switch (alignment)
+			{
+				case TextAlignment.Center:
+					return HorizontalAlignment.Center;
+				case TextAlignment.End:
+					return HorizontalAlignment.Right;
+				default:
+					return HorizontalAlignment.Left;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Platform/Windows/AspectExtensions.cs b/src/Core/src/Platform/Windows/AspectExtensions.cs
new file mode 100644
index 000000000000..723c3f63563e
--- /dev/null
+++ b/src/Core/src/Platform/Windows/AspectExtensions.cs
@@ -0,0 +1,17 @@
+using WStretch = Microsoft.UI.Xaml.Media.Stretch;
+
+namespace Microsoft.Maui
+{
+	public static class AspectExtensions
+	{
+		public static WStretch ToStretch(this Aspect aspect) =>
+			aspect switch
+			{
+				Aspect.AspectFit => WStretch.Uniform,
+				Aspect.AspectFill => WStretch.UniformToFill,
+				Aspect.Fill => WStretch.Fill,
+				Aspect.Center => WStretch.None,
+				_ => WStretch.Uniform,
+			};
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Platform/Windows/ButtonExtensions.cs b/src/Core/src/Platform/Windows/ButtonExtensions.cs
index 6c687c6bbf37..bbe27f5d6eca 100644
--- a/src/Core/src/Platform/Windows/ButtonExtensions.cs
+++ b/src/Core/src/Platform/Windows/ButtonExtensions.cs
@@ -5,8 +5,8 @@ namespace Microsoft.Maui
 {
 	public static class ButtonExtensions
 	{
-		public static void UpdateBackgroundColor(this Button nativeButton, IButton button, UI.Xaml.Media.Brush? defaultBrush = null) =>
-			nativeButton.UpdateBackgroundColor(button.BackgroundColor, defaultBrush);
+		public static void UpdateBackground(this Button nativeButton, IButton button, UI.Xaml.Media.Brush? defaultBrush = null) =>
+			nativeButton.UpdateBackground(button.Background, defaultBrush);
 
 		public static void UpdateText(this Button nativeButton, IButton button) =>
 			nativeButton.Content = button.Text;
diff --git a/src/Core/src/Platform/Windows/CharacterSpacingExtensions.cs b/src/Core/src/Platform/Windows/CharacterSpacingExtensions.cs
index 866d90b6071d..d6a6469d4c3e 100644
--- a/src/Core/src/Platform/Windows/CharacterSpacingExtensions.cs
+++ b/src/Core/src/Platform/Windows/CharacterSpacingExtensions.cs
@@ -6,7 +6,7 @@ public static class CharacterSpacingExtensions
 	{
 		public static int ToEm(this double pt)
 		{
-			return Convert.ToInt32(pt * 0.0624f * 1000); //Coefficient for converting Pt to Em. The value is uniform spacing between characters, in units of 1/1000 of an em.
+			return Convert.ToInt32(pt * 0.0624f * 1000); // Coefficient for converting Pt to Em. The value is uniform spacing between characters, in units of 1/1000 of an em.
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/src/Core/src/Platform/Windows/ColorConverter.cs b/src/Core/src/Platform/Windows/ColorConverter.cs
new file mode 100644
index 000000000000..1203ab39e94f
--- /dev/null
+++ b/src/Core/src/Platform/Windows/ColorConverter.cs
@@ -0,0 +1,27 @@
+using System;
+using Microsoft.UI;
+using WBrush = Microsoft.UI.Xaml.Media.Brush;
+using WSolidColorBrush = Microsoft.UI.Xaml.Media.SolidColorBrush;
+
+namespace Microsoft.Maui
+{
+	public sealed class ColorConverter : UI.Xaml.Data.IValueConverter
+	{
+		public object Convert(object value, Type targetType, object parameter, string language)
+		{
+			var color = (Graphics.Color)value;
+			var defaultColorKey = (string)parameter;
+
+			WBrush defaultBrush = defaultColorKey != null ? 
+				(WBrush)UI.Xaml.Application.Current.Resources[defaultColorKey] : 
+				new WSolidColorBrush(Colors.Transparent);
+
+			return color.IsDefault() ? defaultBrush : color.ToNative();
+		}
+
+		public object ConvertBack(object value, Type targetType, object parameter, string language)
+		{
+			throw new NotImplementedException();
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Platform/Windows/ControlExtensions.cs b/src/Core/src/Platform/Windows/ControlExtensions.cs
index cbfbc4d1c33e..0ef223ca3595 100644
--- a/src/Core/src/Platform/Windows/ControlExtensions.cs
+++ b/src/Core/src/Platform/Windows/ControlExtensions.cs
@@ -10,13 +10,22 @@ public static void UpdateFont(this Control nativeControl, Font font, IFontManage
 		{
 			nativeControl.FontSize = fontManager.GetFontSize(font);
 			nativeControl.FontFamily = fontManager.GetFontFamily(font);
-			nativeControl.FontStyle = font.FontAttributes.ToFontStyle();
-			nativeControl.FontWeight = font.FontAttributes.ToFontWeight();
+			nativeControl.FontStyle = font.ToFontStyle();
+			nativeControl.FontWeight = font.ToFontWeight();
 		}
 
 		public static void UpdateIsEnabled(this Control nativeControl, bool isEnabled) =>
 			nativeControl.IsEnabled = isEnabled;
 
+		public static void UpdateBackground(this Control nativeControl, Paint? paint, UI.Xaml.Media.Brush? defaultBrush = null) =>
+			nativeControl.UpdateProperty(Control.BackgroundProperty, paint.IsNullOrEmpty() ? defaultBrush : paint?.ToNative());
+
+		public static void UpdateBackground(this Border nativeControl, Paint? paint, UI.Xaml.Media.Brush? defaultBrush = null) =>
+			nativeControl.UpdateProperty(Border.BackgroundProperty, paint.IsNullOrEmpty() ? defaultBrush : paint?.ToNative());
+
+		public static void UpdateBackground(this Panel nativeControl, Paint? paint, UI.Xaml.Media.Brush? defaultBrush = null) =>
+			nativeControl.UpdateProperty(Panel.BackgroundProperty, paint.IsNullOrEmpty() ? defaultBrush : paint?.ToNative());
+
 		public static void UpdateForegroundColor(this Control nativeControl, Color color, UI.Xaml.Media.Brush? defaultBrush = null)
 			=> nativeControl.Foreground = color?.ToNative() ?? defaultBrush ?? nativeControl.Foreground;
 
diff --git a/src/Core/src/Platform/Windows/DatePickerExtensions.cs b/src/Core/src/Platform/Windows/DatePickerExtensions.cs
new file mode 100644
index 000000000000..3951a72d6582
--- /dev/null
+++ b/src/Core/src/Platform/Windows/DatePickerExtensions.cs
@@ -0,0 +1,95 @@
+using System;
+using System.Linq;
+using Microsoft.UI.Xaml.Controls;
+
+namespace Microsoft.Maui
+{
+	public static class DatePickerExtensions
+	{
+		public static void UpdateDate(this DatePicker nativeDatePicker, IDatePicker datePicker)
+		{
+			var date = datePicker.Date;
+			nativeDatePicker.Date = new DateTimeOffset(new DateTime(date.Ticks, DateTimeKind.Unspecified));
+
+			nativeDatePicker.UpdateDay(datePicker);
+			nativeDatePicker.UpdateMonth(datePicker);
+			nativeDatePicker.UpdateYear(datePicker);
+		}
+
+		internal static void UpdateDay(this DatePicker nativeDatePicker, IDatePicker datePicker)
+		{
+			nativeDatePicker.DayVisible = true;
+
+			if (string.IsNullOrWhiteSpace(datePicker.Format) || datePicker.Format.Equals("d"))
+			{
+				nativeDatePicker.DayFormat = "day";
+			}
+			else if (datePicker.Format.Equals("D"))
+			{
+				nativeDatePicker.DayFormat = "dayofweek.full";
+			}
+			else
+			{
+				var day = datePicker.Format.Count(x => x == 'd');
+				if (day == 0)
+					nativeDatePicker.DayVisible = false;
+				else if (day == 3)
+					nativeDatePicker.DayFormat = "day dayofweek.abbreviated";
+				else if (day == 4)
+					nativeDatePicker.DayFormat = "dayofweek.full";
+				else
+					nativeDatePicker.DayFormat = "day";
+			}
+		}
+
+		internal static void UpdateMonth(this DatePicker nativeDatePicker, IDatePicker datePicker)
+		{
+			nativeDatePicker.MonthVisible = true;
+
+			if (string.IsNullOrWhiteSpace(datePicker.Format) || datePicker.Format.Equals("d"))
+			{
+				nativeDatePicker.MonthFormat = "month";
+			}
+			else if (datePicker.Format.Equals("D"))
+			{
+				nativeDatePicker.MonthFormat = "month.full";
+			}
+			else
+			{
+				var month = datePicker.Format.Count(x => x == 'M');
+				if (month == 0)
+					nativeDatePicker.MonthVisible = false;
+				else if (month <= 2)
+					nativeDatePicker.MonthFormat = "month.numeric";
+				else if (month == 3)
+					nativeDatePicker.MonthFormat = "month.abbreviated";
+				else
+					nativeDatePicker.MonthFormat = "month.full";
+			}
+		}
+
+		internal static void UpdateYear(this DatePicker nativeDatePicker, IDatePicker datePicker)
+		{
+			nativeDatePicker.YearVisible = true;
+
+			if (string.IsNullOrWhiteSpace(datePicker.Format) || datePicker.Format.Equals("d"))
+			{
+				nativeDatePicker.YearFormat = "year";
+			}
+			else if (datePicker.Format.Equals("D"))
+			{
+				nativeDatePicker.YearFormat = "year.full";
+			}
+			else
+			{
+				var year = datePicker.Format.Count(x => x == 'y');
+				if (year == 0)
+					nativeDatePicker.YearVisible = false;
+				else if (year <= 2)
+					nativeDatePicker.YearFormat = "year.abbreviated";
+				else
+					nativeDatePicker.YearFormat = "year.full";
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Platform/Windows/FontExtensions.cs b/src/Core/src/Platform/Windows/FontExtensions.cs
index 80277b752464..4c031ee99aaa 100644
--- a/src/Core/src/Platform/Windows/FontExtensions.cs
+++ b/src/Core/src/Platform/Windows/FontExtensions.cs
@@ -1,14 +1,31 @@
 using Microsoft.UI.Text;
 using Windows.UI.Text;
-
+using FontWeights = Microsoft.UI.Text.FontWeights;
+using FWeight = Windows.UI.Text.FontWeight;
 namespace Microsoft.Maui
 {
 	public static class FontExtensions
 	{
-		public static FontStyle ToFontStyle(this FontAttributes fontAttributes) =>
-			fontAttributes.HasFlag(FontAttributes.Italic) ? FontStyle.Italic : FontStyle.Normal;
+		public static FontStyle ToFontStyle(this Font fontAttributes) =>
+				fontAttributes.FontSlant switch
+				{
+					FontSlant.Italic => FontStyle.Italic,
+					FontSlant.Oblique => FontStyle.Oblique,
+					_ => FontStyle.Normal,
+				};
 
-		public static FontWeight ToFontWeight(this FontAttributes fontAttributes) =>
-			fontAttributes.HasFlag(FontAttributes.Bold) ? FontWeights.Bold : FontWeights.Normal;
+		public static FWeight ToFontWeight(this Font font) => font.Weight switch
+		{
+			FontWeight.Black => FontWeights.Black,
+			FontWeight.Bold => FontWeights.Bold,
+			FontWeight.Heavy => FontWeights.ExtraBold,
+			FontWeight.Light => FontWeights.Light,
+			FontWeight.Medium => FontWeights.Medium,
+			FontWeight.Regular => FontWeights.Normal,
+			FontWeight.Semibold => FontWeights.SemiBold,
+			FontWeight.Thin => FontWeights.Thin,
+			FontWeight.Ultralight => FontWeights.ExtraLight,
+			FontWeight f => new FWeight((ushort)f)
+		};
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Platform/Windows/ImageViewExtensions.cs b/src/Core/src/Platform/Windows/ImageViewExtensions.cs
new file mode 100644
index 000000000000..b570de087e39
--- /dev/null
+++ b/src/Core/src/Platform/Windows/ImageViewExtensions.cs
@@ -0,0 +1,115 @@
+#nullable enable
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.UI.Xaml.Media.Imaging;
+using Windows.Foundation.Metadata;
+using WImage = Microsoft.UI.Xaml.Controls.Image;
+using WImageSource = Microsoft.UI.Xaml.Media.ImageSource;
+
+namespace Microsoft.Maui
+{
+	public static class ImageViewExtensions
+	{
+		const string BitmapImageTypeName = "Microsoft.UI.Xaml.Media.Imaging.BitmapImage";
+
+		static bool IsAnimationSupported;
+
+		static ImageViewExtensions()
+		{
+			IsAnimationSupported =
+				ApiInformation.IsPropertyPresent(BitmapImageTypeName, nameof(BitmapImage.IsAnimatedBitmap)) &&
+				ApiInformation.IsPropertyPresent(BitmapImageTypeName, nameof(BitmapImage.IsPlaying)) &&
+				ApiInformation.IsPropertyPresent(BitmapImageTypeName, nameof(BitmapImage.Play)) &&
+				ApiInformation.IsPropertyPresent(BitmapImageTypeName, nameof(BitmapImage.Stop));
+		}
+
+		public static void Clear(this WImage imageView)
+		{
+			imageView.Source = null;
+		}
+
+		public static void UpdateAspect(this WImage imageView, IImage image)
+		{
+			imageView.Stretch = image.Aspect.ToStretch();
+		}
+
+		public static void UpdateIsAnimationPlaying(this WImage imageView, IImageSourcePart image)
+		{
+			if (!IsAnimationSupported)
+				return;
+
+			if (imageView.Source is BitmapImage bitmapImage && bitmapImage.IsAnimatedBitmap)
+			{
+				if (image.IsAnimationPlaying)
+				{
+					if (!bitmapImage.IsPlaying)
+						bitmapImage.Play();
+				}
+				else
+				{
+					if (bitmapImage.IsPlaying)
+						bitmapImage.Stop();
+				}
+			}
+		}
+
+		public static async Task<IImageSourceServiceResult<WImageSource>?> UpdateSourceAsync(this WImage imageView, IImageSourcePart image, IImageSourceServiceProvider services, CancellationToken cancellationToken = default)
+		{
+			imageView.Clear();
+
+			image.UpdateIsLoading(false);
+
+			var imageSource = image.Source;
+			if (imageSource == null)
+				return null;
+
+			var events = image as IImageSourcePartEvents;
+
+			events?.LoadingStarted();
+			image.UpdateIsLoading(true);
+
+			try
+			{
+				var service = services.GetRequiredImageSourceService(imageSource);
+
+				var scale = imageView.XamlRoot?.RasterizationScale ?? 1;
+				var result = await service.GetImageSourceAsync(imageSource, (float)scale, cancellationToken);
+				var uiImage = result?.Value;
+
+				var applied = !cancellationToken.IsCancellationRequested && imageSource == image.Source;
+
+				// only set the image if we are still on the same one
+				if (applied)
+				{
+					imageView.Source = uiImage;
+
+					imageView.UpdateIsAnimationPlaying(image);
+				}
+
+				events?.LoadingCompleted(applied);
+
+				return result;
+			}
+			catch (OperationCanceledException)
+			{
+				// no-op
+				events?.LoadingCompleted(false);
+			}
+			catch (Exception ex)
+			{
+				events?.LoadingFailed(ex);
+			}
+			finally
+			{
+				// only mark as finished if we are still working on the same image
+				if (imageSource == image.Source)
+				{
+					image.UpdateIsLoading(false);
+				}
+			}
+
+			return null;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Platform/Windows/MauiCombobox.cs b/src/Core/src/Platform/Windows/MauiCombobox.cs
new file mode 100644
index 000000000000..c6dc801e9a40
--- /dev/null
+++ b/src/Core/src/Platform/Windows/MauiCombobox.cs
@@ -0,0 +1,26 @@
+#nullable enable
+using Microsoft.UI.Xaml.Controls;
+
+namespace Microsoft.Maui
+{
+	public class MauiComboBox : ComboBox
+	{
+		public MauiComboBox()
+		{
+			DefaultStyleKey = typeof(MauiComboBox);
+
+			DropDownOpened += OnMauiComboBoxDropDownOpened;
+			SelectionChanged += OnMauiComboBoxSelectionChanged;
+		}
+
+		void OnMauiComboBoxDropDownOpened(object? sender, object e)
+		{
+			MinWidth = ActualWidth;
+		}
+
+		void OnMauiComboBoxSelectionChanged(object? sender, SelectionChangedEventArgs e)
+		{
+			MinWidth = 0;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Platform/Windows/MauiWinUIApplication.cs b/src/Core/src/Platform/Windows/MauiWinUIApplication.cs
index 21db09660610..8d9b51acc0bd 100644
--- a/src/Core/src/Platform/Windows/MauiWinUIApplication.cs
+++ b/src/Core/src/Platform/Windows/MauiWinUIApplication.cs
@@ -35,13 +35,12 @@ protected override void OnLaunched(UI.Xaml.LaunchActivatedEventArgs args)
 
 			var activationState = new ActivationState(mauiContext, args);
 			var window = Application.CreateWindow(activationState);
-			window.MauiContext = mauiContext;
 
-			var content = (window.Page as IView) ?? window.Page.Content;
+			var content = (window.View as IView);
 
 			var canvas = CreateRootContainer();
 
-			var nativeContent = content.ToNative(window.MauiContext);
+			var nativeContent = content.ToNative(mauiContext);
 
 			canvas.Children.Add(nativeContent);
 
@@ -101,4 +100,4 @@ protected MauiWinUIApplication()
 
 		public IApplication Application { get; protected set; } = null!;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Core/src/Platform/Windows/MauiWinUIWindow.cs b/src/Core/src/Platform/Windows/MauiWinUIWindow.cs
index a3162aa9b2d3..e0cafdd0a127 100644
--- a/src/Core/src/Platform/Windows/MauiWinUIWindow.cs
+++ b/src/Core/src/Platform/Windows/MauiWinUIWindow.cs
@@ -15,7 +15,7 @@ public MauiWinUIWindow()
 			if (!Application.Current.Resources.ContainsKey("MauiRootContainerStyle"))
 			{
 				var myResourceDictionary = new Microsoft.UI.Xaml.ResourceDictionary();
-				myResourceDictionary.Source = new Uri("ms-appx:///Microsoft.Maui/Platform/Windows/Styles/MauiTextBoxStyle.xbf");
+				myResourceDictionary.Source = new Uri("ms-appx:///Microsoft.Maui/Platform/Windows/Styles/Resources.xbf");
 				Microsoft.UI.Xaml.Application.Current.Resources.MergedDictionaries.Add(myResourceDictionary);
 			}
 		}
diff --git a/src/Core/src/Platform/Windows/NativeVersion.cs b/src/Core/src/Platform/Windows/NativeVersion.cs
new file mode 100644
index 000000000000..628285d08942
--- /dev/null
+++ b/src/Core/src/Platform/Windows/NativeVersion.cs
@@ -0,0 +1,12 @@
+using Microsoft.UI.Xaml;
+
+namespace Microsoft.Maui
+{
+	public static class NativeVersion
+	{
+		// https://docs.microsoft.com/en-us/windows/winui/api/microsoft.ui.xaml.window.current?view=winui-3.0
+		// The currently activated window for UWP apps. Null for Desktop apps.
+		public static bool IsDesktop =>
+			Window.Current == null;
+	}
+}
diff --git a/src/Core/src/Platform/Windows/PickerExtensions.cs b/src/Core/src/Platform/Windows/PickerExtensions.cs
new file mode 100644
index 000000000000..c2350b2bec2b
--- /dev/null
+++ b/src/Core/src/Platform/Windows/PickerExtensions.cs
@@ -0,0 +1,50 @@
+#nullable enable
+using Microsoft.Maui.Graphics;
+using WBrush = Microsoft.UI.Xaml.Media.Brush;
+
+namespace Microsoft.Maui
+{
+	public static class PickerExtensions
+	{
+		public static void UpdateTitle(this MauiComboBox nativeComboBox, IPicker picker)
+		{
+			nativeComboBox.Header = null;
+
+			nativeComboBox.HeaderTemplate = string.IsNullOrEmpty(picker.Title) ? null : 
+				(UI.Xaml.DataTemplate)UI.Xaml.Application.Current.Resources["ComboBoxHeader"];
+
+			nativeComboBox.DataContext = picker;
+		}
+		public static void UpdateTextColor(this MauiComboBox nativeComboBox, IPicker picker)
+		{
+			nativeComboBox.UpdateTextColor(picker, null);
+		}
+
+		public static void UpdateTextColor(this MauiComboBox nativeComboBox, IPicker picker, WBrush? defaultForeground)
+		{
+			Color color = picker.TextColor;
+			if (color.IsDefault() && defaultForeground == null)
+				return;
+
+			nativeComboBox.Foreground = color.IsDefault() ? (defaultForeground ?? color.ToNative()) : color.ToNative();
+		}
+
+		public static void UpdateSelectedIndex(this MauiComboBox nativeComboBox, IPicker picker)
+		{
+			nativeComboBox.SelectedIndex = picker.SelectedIndex;
+		}
+
+		public static void UpdateCharacterSpacing(this MauiComboBox nativeComboBox, IPicker picker)
+		{
+			nativeComboBox.CharacterSpacing = picker.CharacterSpacing.ToEm();
+		}
+
+		public static void UpdateFont(this MauiComboBox nativeComboBox, IPicker picker, IFontManager fontManager) =>
+			nativeComboBox.UpdateFont(picker.Font, fontManager); 
+		
+		public static void UpdateHorizontalTextAlignment(this MauiComboBox nativeComboBox, IPicker picker)
+		{
+			nativeComboBox.HorizontalContentAlignment = picker.HorizontalTextAlignment.ToNativeHorizontalAlignment();
+		}
+	}
+}
diff --git a/src/Core/src/Platform/Windows/SearchBarExtensions.cs b/src/Core/src/Platform/Windows/SearchBarExtensions.cs
index 6069b3eef1e6..2645dbb6456a 100644
--- a/src/Core/src/Platform/Windows/SearchBarExtensions.cs
+++ b/src/Core/src/Platform/Windows/SearchBarExtensions.cs
@@ -4,9 +4,19 @@ namespace Microsoft.Maui
 {
 	public static class SearchBarExtensions
 	{
-		public static void UpdateText(this AutoSuggestBox autoSuggestBox, ISearchBar searchBar)
+		public static void UpdateCharacterSpacing(this AutoSuggestBox nativeControl, ISearchBar searchBar)
 		{
-			autoSuggestBox.Text = searchBar.Text;
+			nativeControl.CharacterSpacing = searchBar.CharacterSpacing.ToEm();
+		}
+
+		public static void UpdatePlaceholder(this AutoSuggestBox nativeControl, ISearchBar searchBar)
+		{
+			nativeControl.PlaceholderText = searchBar.Placeholder ?? string.Empty;
+		}
+  
+		public static void UpdateText(this AutoSuggestBox nativeControl, ISearchBar searchBar)
+		{
+			nativeControl.Text = searchBar.Text;
 		}
 	}
 }
diff --git a/src/Core/src/Platform/Windows/SliderExtensions.cs b/src/Core/src/Platform/Windows/SliderExtensions.cs
new file mode 100644
index 000000000000..4dd53ce8dfc7
--- /dev/null
+++ b/src/Core/src/Platform/Windows/SliderExtensions.cs
@@ -0,0 +1,51 @@
+#nullable enable
+using System;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media;
+
+namespace Microsoft.Maui
+{
+	public static class SliderExtensions
+	{
+		static void UpdateIncrement(this Slider nativeSlider, ISlider slider)
+		{
+			double stepping = Math.Min((slider.Maximum - slider.Minimum) / 1000, 1);
+			nativeSlider.StepFrequency = stepping;
+			nativeSlider.SmallChange = stepping;
+		}
+
+		public static void UpdateMinimum(this Slider nativeSlider, ISlider slider)
+		{
+			nativeSlider.Minimum = slider.Minimum;
+			nativeSlider.UpdateIncrement(slider);
+		}
+
+		public static void UpdateMaximum(this Slider nativeSlider, ISlider slider)
+		{
+			nativeSlider.Maximum = slider.Maximum;
+			nativeSlider.UpdateIncrement(slider);
+		}
+
+		public static void UpdateValue(this Slider nativeSlider, ISlider slider)
+		{
+			if (nativeSlider.Value != slider.Value)
+				nativeSlider.Value = slider.Value;
+		}
+
+		public static void UpdateMinimumTrackColor(this Slider nativeSlider, ISlider slider, Brush? defaultForegroundColor)
+		{
+			if (slider.MinimumTrackColor.IsDefault())
+				nativeSlider.Foreground = defaultForegroundColor;
+			else
+				nativeSlider.Foreground = slider.MinimumTrackColor.ToNative();
+		}
+
+		public static void UpdateMaximumTrackColor(this Slider nativeSlider, ISlider slider, Brush? defaultBackgroundColor)
+		{
+			if (slider.MaximumTrackColor.IsDefault())
+				nativeSlider.Background = defaultBackgroundColor;
+			else
+				nativeSlider.Background = slider.MaximumTrackColor.ToNative();
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Platform/Windows/Styles/MauiComboBoxStyle.xaml b/src/Core/src/Platform/Windows/Styles/MauiComboBoxStyle.xaml
new file mode 100644
index 000000000000..24c9b6285fa9
--- /dev/null
+++ b/src/Core/src/Platform/Windows/Styles/MauiComboBoxStyle.xaml
@@ -0,0 +1,262 @@
+<ResourceDictionary
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:uwp="using:Microsoft.Maui">
+
+    <Style TargetType="uwp:MauiComboBox">
+        <Setter Property="Padding" Value="12,5,0,7" />
+        <Setter Property="MinWidth" Value="{ThemeResource ComboBoxThemeMinWidth}" />
+        <Setter Property="Foreground" Value="{ThemeResource ComboBoxForeground}" />
+        <Setter Property="Background" Value="{ThemeResource ComboBoxBackground}" />
+        <Setter Property="BorderBrush" Value="{ThemeResource ComboBoxBorderBrush}" />
+        <Setter Property="BorderThickness" Value="{ThemeResource ComboBoxBorderThemeThickness}" />
+        <Setter Property="TabNavigation" Value="Once" />
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+        <Setter Property="ScrollViewer.HorizontalScrollMode" Value="Disabled" />
+        <Setter Property="ScrollViewer.VerticalScrollMode" Value="Auto" />
+        <Setter Property="ScrollViewer.IsVerticalRailEnabled" Value="True" />
+        <Setter Property="ScrollViewer.IsDeferredScrollingEnabled" Value="False" />
+        <Setter Property="ScrollViewer.BringIntoViewOnFocusChange" Value="True" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="VerticalAlignment" Value="Top" />
+        <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
+        <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
+        <Setter Property="HeaderTemplate" Value="{StaticResource ComboBoxHeader}" />
+        <Setter Property="ItemTemplate" Value="{StaticResource PickerItem}" />
+        <Setter Property="ItemContainerStyle" Value="{StaticResource PickerItemContainer}"/>
+        <Setter Property="ItemsPanel">
+            <Setter.Value>
+                <ItemsPanelTemplate>
+                    <CarouselPanel />
+                </ItemsPanelTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="uwp:MauiComboBox">
+                    <Grid x:Name="LayoutRoot">
+                        <Grid.Resources>
+                            <Storyboard x:Key="OverlayOpeningAnimation">
+                                <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity">
+                                    <DiscreteDoubleKeyFrame KeyTime="0:0:0" Value="0.0" />
+                                    <SplineDoubleKeyFrame KeyTime="0:0:0.383" KeySpline="0.1,0.9 0.2,1.0" Value="1.0" />
+                                </DoubleAnimationUsingKeyFrames>
+                            </Storyboard>
+                            <Storyboard x:Key="OverlayClosingAnimation">
+                                <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity">
+                                    <DiscreteDoubleKeyFrame KeyTime="0:0:0" Value="1.0" />
+                                    <SplineDoubleKeyFrame KeyTime="0:0:0.216" KeySpline="0.1,0.9 0.2,1.0" Value="0.0" />
+                                </DoubleAnimationUsingKeyFrames>
+                            </Storyboard>
+                        </Grid.Resources>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="*" />
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="32" />
+                        </Grid.ColumnDefinitions>
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="PointerOver">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Background" Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxBackgroundPointerOver}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Background" Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxBorderBrushPointerOver}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Pressed">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Background" Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxBackgroundPressed}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Background" Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxBorderBrushPressed}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Background" Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxBackgroundDisabled}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Background" Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxBorderBrushDisabled}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HeaderContentPresenter" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxForegroundDisabled}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxForegroundDisabled}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PlaceholderTextBlock" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{Binding PlaceholderForeground, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={ThemeResource ComboBoxForegroundDisabled}}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="DropDownGlyph" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxDropDownGlyphForegroundDisabled}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="FocusStates">
+                                <VisualState x:Name="Focused">
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="HighlightBackground"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="1"
+                                            Duration="0" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HighlightBackground" Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxBackgroundBorderBrushFocused}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxForegroundFocused}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PlaceholderTextBlock" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{Binding PlaceholderForeground, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={ThemeResource ComboBoxForegroundFocused}}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="DropDownGlyph" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxDropDownGlyphForegroundFocused}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="FocusedPressed">
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="HighlightBackground"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="1"
+                                            Duration="0" />
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxForegroundFocusedPressed}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PlaceholderTextBlock" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{Binding PlaceholderForeground, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={ThemeResource ComboBoxPlaceHolderForegroundFocusedPressed}}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="DropDownGlyph" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxDropDownGlyphForegroundFocusedPressed}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Unfocused" />
+                                <VisualState x:Name="PointerFocused" />
+                                <VisualState x:Name="FocusedDropDown">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PopupBorder" Storyboard.TargetProperty="Visibility" Duration="0">
+                                            <DiscreteObjectKeyFrame KeyTime="0">
+                                                <DiscreteObjectKeyFrame.Value>
+                                                    <Visibility>Visible</Visibility>
+                                                </DiscreteObjectKeyFrame.Value>
+                                            </DiscreteObjectKeyFrame>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="DropDownStates">
+                                <VisualState x:Name="Opened">
+                                    <Storyboard>
+                                        <SplitOpenThemeAnimation OpenedTargetName="PopupBorder"
+                                        ClosedTargetName="ContentPresenter"
+                                        OffsetFromCenter="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.DropDownOffset}"
+                                        OpenedLength="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.DropDownOpenedHeight}" />
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Closed">
+                                    <Storyboard>
+                                        <SplitCloseThemeAnimation OpenedTargetName="PopupBorder"
+                                            ClosedTargetName="ContentPresenter"
+                                            OffsetFromCenter="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.DropDownOffset}"
+                                            OpenedLength="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.DropDownOpenedHeight}" />
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                        <ContentPresenter x:Name="HeaderContentPresenter"
+                            x:DeferLoadStrategy="Lazy"
+                            Margin="{ThemeResource ComboBoxHeaderThemeMargin}"
+                            FlowDirection="{TemplateBinding FlowDirection}"
+                            FontWeight="{ThemeResource ComboBoxHeaderThemeFontWeight}"
+                            Visibility="Collapsed"
+                            Content="{TemplateBinding Header}"
+                            ContentTemplate="{TemplateBinding HeaderTemplate}"
+                            CharacterSpacing="{TemplateBinding CharacterSpacing}" />
+                        <Border x:Name="Background"
+                            Grid.Row="1"
+                            Grid.ColumnSpan="2"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}" />
+                        <Border x:Name="HighlightBackground"
+                            Grid.Row="1"
+                            Grid.ColumnSpan="2"
+                            Background="{ThemeResource ComboBoxBackgroundUnfocused}"
+                            BorderBrush="{ThemeResource ComboBoxBackgroundBorderBrushUnfocused}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Opacity="0" />
+                        <ContentPresenter x:Name="ContentPresenter"
+                            Grid.Row="1"
+                            Margin="{TemplateBinding Padding}"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            CharacterSpacing="{TemplateBinding CharacterSpacing}">
+                            <TextBlock x:Name="PlaceholderTextBlock"
+                                Text="{TemplateBinding PlaceholderText}"
+                                Foreground="{Binding PlaceholderForeground, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={ThemeResource ComboBoxPlaceHolderForeground}}" />
+                        </ContentPresenter>
+                        <FontIcon x:Name="DropDownGlyph"
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            IsHitTestVisible="False"
+                            Margin="0,10,10,10"
+                            Foreground="{ThemeResource ComboBoxDropDownGlyphForeground}"
+                            FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                            FontSize="12"
+                            Glyph="&#xE0E5;"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Center"
+                            AutomationProperties.AccessibilityView="Raw" />
+                        <Popup x:Name="Popup">
+                            <Border x:Name="PopupBorder"
+                                Background="{ThemeResource ComboBoxDropDownBackground}"
+                                BorderBrush="{ThemeResource ComboBoxDropDownBorderBrush}"
+                                BorderThickness="{ThemeResource ComboBoxDropdownBorderThickness}"
+                                Margin="0,-1,0,-1"
+                                HorizontalAlignment="Stretch">
+                                <ScrollViewer x:Name="ScrollViewer"
+                                    Foreground="{ThemeResource ComboBoxDropDownForeground}"
+                                    MinWidth="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.DropDownContentMinWidth}"
+                                    VerticalSnapPointsType="OptionalSingle"
+                                    VerticalSnapPointsAlignment="Near"
+                                    HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}"
+                                    HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                                    VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}"
+                                    VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
+                                    IsHorizontalRailEnabled="{TemplateBinding ScrollViewer.IsHorizontalRailEnabled}"
+                                    IsVerticalRailEnabled="{TemplateBinding ScrollViewer.IsVerticalRailEnabled}"
+                                    IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
+                                    BringIntoViewOnFocusChange="{TemplateBinding ScrollViewer.BringIntoViewOnFocusChange}"
+                                    ZoomMode="Disabled"
+                                    AutomationProperties.AccessibilityView="Raw">
+                                    <ItemsPresenter Margin="{ThemeResource ComboBoxDropdownContentMargin}" />
+                                </ScrollViewer>
+                            </Border>
+                        </Popup>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <DataTemplate x:Key="ComboBoxHeader">
+        <TextBlock
+            Text="{Binding Title}" 
+            CharacterSpacing="{Binding Path=CharacterSpacing, ElementName=HeaderContentPresenter}"
+            Foreground="{Binding TitleColor, Converter={StaticResource ColorConverter}, ConverterParameter=DefaultTextForegroundThemeBrush}" />
+    </DataTemplate>
+    
+</ResourceDictionary> 
\ No newline at end of file
diff --git a/src/Core/src/Platform/Windows/Styles/Resources.xaml b/src/Core/src/Platform/Windows/Styles/Resources.xaml
index eace73f4a171..9f8f62fb86f2 100644
--- a/src/Core/src/Platform/Windows/Styles/Resources.xaml
+++ b/src/Core/src/Platform/Windows/Styles/Resources.xaml
@@ -5,7 +5,10 @@
 	x:Class="Microsoft.Maui.Resources">
 
     <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="MauiComboBoxStyle.xaml" />
         <ResourceDictionary Source="MauiTextBoxStyle.xaml" />
     </ResourceDictionary.MergedDictionaries>
-	
+     
+    <uwp:ColorConverter x:Key="ColorConverter" />
+    
 </ResourceDictionary>
diff --git a/src/Core/src/Platform/Windows/TextBlockExtensions.cs b/src/Core/src/Platform/Windows/TextBlockExtensions.cs
index da6dbf76589f..52aac84cd988 100644
--- a/src/Core/src/Platform/Windows/TextBlockExtensions.cs
+++ b/src/Core/src/Platform/Windows/TextBlockExtensions.cs
@@ -9,8 +9,8 @@ public static void UpdateFont(this TextBlock nativeControl, Font font, IFontMana
 		{
 			nativeControl.FontSize = fontManager.GetFontSize(font);
 			nativeControl.FontFamily = fontManager.GetFontFamily(font);
-			nativeControl.FontStyle = font.FontAttributes.ToFontStyle();
-			nativeControl.FontWeight = font.FontAttributes.ToFontWeight();
+			nativeControl.FontStyle = font.ToFontStyle();
+			nativeControl.FontWeight = font.ToFontWeight();
 		}
 
 		public static void UpdateFont(this TextBlock nativeControl, IText text, IFontManager fontManager) =>
diff --git a/src/Core/src/Platform/Windows/TextBoxExtensions.cs b/src/Core/src/Platform/Windows/TextBoxExtensions.cs
index d2c7a3ce6b4e..abdbca56a651 100644
--- a/src/Core/src/Platform/Windows/TextBoxExtensions.cs
+++ b/src/Core/src/Platform/Windows/TextBoxExtensions.cs
@@ -2,19 +2,88 @@ namespace Microsoft.Maui
 {
 	public static class TextBoxExtensions
 	{
+		public static void UpdateText(this MauiTextBox nativeControl, IEditor editor)
+		{
+			string newText = editor.Text;
+
+			if (nativeControl.Text == newText)
+				return;
+
+			nativeControl.Text = newText;
+
+			if (!string.IsNullOrEmpty(nativeControl.Text))
+				nativeControl.SelectionStart = nativeControl.Text.Length;
+		}
+
 		public static void UpdateText(this MauiTextBox textBox, IEntry entry)
 		{
 			textBox.Text = entry.Text;
 		}
 
-		public static void UpdateTextColor(this MauiTextBox textView, ITextStyle textStyle)
+		public static void UpdateTextColor(this MauiTextBox textBox, ITextStyle textStyle)
 		{
 			if (textStyle.TextColor == null)
 				return;
 
 			var brush = textStyle.TextColor.ToNative();
-			textView.Foreground = brush;
-			textView.ForegroundFocusBrush = brush;
+			textBox.Foreground = brush;
+			textBox.ForegroundFocusBrush = brush;
+		}
+
+		public static void UpdatePlaceholder(this MauiTextBox textBox, IEditor editor)
+		{
+			textBox.PlaceholderText = editor.Placeholder ?? string.Empty;
+		}
+
+		public static void UpdatePlaceholder(this MauiTextBox textBox, IEntry entry)
+		{
+			textBox.PlaceholderText = entry.Placeholder ?? string.Empty;
+		}
+
+		public static void UpdateFont(this MauiTextBox nativeControl, IText text, IFontManager fontManager) =>		
+			nativeControl.UpdateFont(text.Font, fontManager);
+
+		public static void UpdateFont(this MauiTextBox nativeControl, Font font, IFontManager fontManager)
+		{
+			nativeControl.FontSize = fontManager.GetFontSize(font);
+			nativeControl.FontFamily = fontManager.GetFontFamily(font);
+			nativeControl.FontStyle = font.ToFontStyle();
+			nativeControl.FontWeight = font.ToFontWeight();
+		}
+
+		public static void UpdateIsReadOnly(this MauiTextBox textBox, IEditor editor)
+		{
+			textBox.IsReadOnly = editor.IsReadOnly;
+		}
+
+		public static void UpdateIsReadOnly(this MauiTextBox textBox, IEntry entry)
+		{
+			textBox.IsReadOnly = entry.IsReadOnly;
+		}
+
+		public static void UpdateMaxLength(this MauiTextBox textBox, IEditor editor)
+		{
+			textBox.MaxLength = editor.MaxLength;
+
+			var currentControlText = textBox.Text;
+
+			if (currentControlText.Length > editor.MaxLength)
+				textBox.Text = currentControlText.Substring(0, editor.MaxLength);
+		}
+
+		public static void UpdateMaxLength(this MauiTextBox textBox, IEntry entry)
+		{
+			var maxLength = entry.MaxLength;
+
+			if (maxLength == -1)
+				maxLength = int.MaxValue;
+
+			textBox.MaxLength = maxLength;
+
+			var currentControlText = textBox.Text;
+
+			if (currentControlText.Length > maxLength)
+				textBox.Text = currentControlText.Substring(0, maxLength);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Core/src/Platform/Windows/TextElementExtensions.cs b/src/Core/src/Platform/Windows/TextElementExtensions.cs
index 33643a60abc2..9d98c925a241 100644
--- a/src/Core/src/Platform/Windows/TextElementExtensions.cs
+++ b/src/Core/src/Platform/Windows/TextElementExtensions.cs
@@ -8,8 +8,8 @@ public static void UpdateFont(this TextElement nativeControl, Font font, IFontMa
 		{
 			nativeControl.FontSize = fontManager.GetFontSize(font);
 			nativeControl.FontFamily = fontManager.GetFontFamily(font);
-			nativeControl.FontStyle = font.FontAttributes.ToFontStyle();
-			nativeControl.FontWeight = font.FontAttributes.ToFontWeight();
+			nativeControl.FontStyle = font.ToFontStyle();
+			nativeControl.FontWeight = font.ToFontWeight();
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Platform/Windows/TimePickerExtensions.cs b/src/Core/src/Platform/Windows/TimePickerExtensions.cs
new file mode 100644
index 000000000000..077a031b53e8
--- /dev/null
+++ b/src/Core/src/Platform/Windows/TimePickerExtensions.cs
@@ -0,0 +1,21 @@
+using Microsoft.UI.Xaml.Controls;
+
+namespace Microsoft.Maui
+{
+	public static class TimePickerExtensions
+	{
+		public static void UpdateTime(this TimePicker nativeTimePicker, ITimePicker timePicker)
+		{
+			nativeTimePicker.Time = timePicker.Time;
+
+			if (timePicker.Format?.Contains('H') == true)
+			{
+				nativeTimePicker.ClockIdentifier = "24HourClock";
+			}
+			else
+			{
+				nativeTimePicker.ClockIdentifier = "12HourClock";
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Platform/Windows/ViewExtensions.cs b/src/Core/src/Platform/Windows/ViewExtensions.cs
index 583faada259a..c640d3215b99 100644
--- a/src/Core/src/Platform/Windows/ViewExtensions.cs
+++ b/src/Core/src/Platform/Windows/ViewExtensions.cs
@@ -10,27 +10,38 @@ public static class ViewExtensions
 	{
 		public static void UpdateIsEnabled(this FrameworkElement nativeView, IView view) =>
 			(nativeView as Control)?.UpdateIsEnabled(view.IsEnabled);
+		
+		public static void UpdateVisibility(this FrameworkElement nativeView, IView view)
+		{
+			double opacity = view.Opacity;
+
+			switch (view.Visibility)
+			{
+				case Visibility.Visible:
+					nativeView.Opacity = opacity;
+					nativeView.Visibility = UI.Xaml.Visibility.Visible;
+					break;
+				case Visibility.Hidden:
+					nativeView.Opacity = 0;
+					nativeView.Visibility = UI.Xaml.Visibility.Visible;
+					break;
+				case Visibility.Collapsed:
+					nativeView.Opacity = opacity;
+					nativeView.Visibility = UI.Xaml.Visibility.Collapsed;
+					break;
+			}
+		}
 
-		public static void UpdateBackgroundColor(this FrameworkElement nativeView, IView view)
+		public static void UpdateBackground(this FrameworkElement nativeView, IView view)
 		{
 			if (nativeView is Control control)
-				control.UpdateBackgroundColor(view.BackgroundColor);
+				control.UpdateBackground(view.Background);
 			else if (nativeView is Border border)
-				border.UpdateBackgroundColor(view.BackgroundColor);
+				border.UpdateBackground(view.Background);
 			else if (nativeView is Panel panel)
-				panel.UpdateBackgroundColor(view.BackgroundColor);
+				panel.UpdateBackground(view.Background);
 		}
 
-		// TODO ezhart Do we need all three of these? 
-		public static void UpdateBackgroundColor(this Control nativeControl, Color color, UI.Xaml.Media.Brush? defaultBrush = null) =>
-			nativeControl.Background = color?.ToNative() ?? defaultBrush ?? nativeControl.Background;
-
-		public static void UpdateBackgroundColor(this Border nativeControl, Color color, UI.Xaml.Media.Brush? defaultBrush = null) =>
-			nativeControl.Background = color?.ToNative() ?? defaultBrush ?? nativeControl.Background;
-
-		public static void UpdateBackgroundColor(this Panel nativeControl, Color color, UI.Xaml.Media.Brush? defaultBrush = null) =>
-			nativeControl.Background = color?.ToNative() ?? defaultBrush ?? nativeControl.Background;
-
 		public static void UpdateAutomationId(this FrameworkElement nativeView, IView view) =>
 			AutomationProperties.SetAutomationId(nativeView, view.AutomationId);
 
@@ -60,5 +71,22 @@ internal static void UpdateProperty(this FrameworkElement nativeControl, Depende
 			else
 				nativeControl.SetValue(property, value);
 		}
+
+		public static void InvalidateMeasure(this FrameworkElement nativeView, IView view) 
+		{
+			nativeView.InvalidateMeasure();
+		}
+
+		public static void UpdateWidth(this FrameworkElement nativeView, IView view)
+		{
+			// WinUI uses NaN for "unspecified"
+			nativeView.Width = view.Width >= 0 ? view.Width : double.NaN;
+		}
+
+		public static void UpdateHeight(this FrameworkElement nativeView, IView view)
+		{
+			// WinUI uses NaN for "unspecified"
+			nativeView.Height = view.Height >= 0 ? view.Height : double.NaN;
+		}
 	}
 }
diff --git a/src/Core/src/Platform/MaciOS/ActivationState.cs b/src/Core/src/Platform/iOS/ActivationState.cs
similarity index 100%
rename from src/Core/src/Platform/MaciOS/ActivationState.cs
rename to src/Core/src/Platform/iOS/ActivationState.cs
diff --git a/src/Core/src/Platform/iOS/AspectExtensions.cs b/src/Core/src/Platform/iOS/AspectExtensions.cs
new file mode 100644
index 000000000000..5007841f5177
--- /dev/null
+++ b/src/Core/src/Platform/iOS/AspectExtensions.cs
@@ -0,0 +1,17 @@
+using UIKit;
+
+namespace Microsoft.Maui
+{
+	public static class AspectExtensions
+	{
+		public static UIViewContentMode ToUIViewContentMode(this Aspect aspect) =>
+			aspect switch
+			{
+				Aspect.AspectFit => UIViewContentMode.ScaleAspectFit,
+				Aspect.AspectFill => UIViewContentMode.ScaleAspectFill,
+				Aspect.Fill => UIViewContentMode.ScaleToFill,
+				Aspect.Center => UIViewContentMode.Center,
+				_ => UIViewContentMode.ScaleAspectFit,
+			};
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Platform/iOS/ButtonExtensions.cs b/src/Core/src/Platform/iOS/ButtonExtensions.cs
index 5254b86000ca..8a8dd5c11cc8 100644
--- a/src/Core/src/Platform/iOS/ButtonExtensions.cs
+++ b/src/Core/src/Platform/iOS/ButtonExtensions.cs
@@ -38,7 +38,7 @@ public static void UpdateCharacterSpacing(this UIButton nativeButton, ITextStyle
 
 		public static void UpdateFont(this UIButton nativeButton, ITextStyle textStyle, IFontManager fontManager)
 		{
-			nativeButton.TitleLabel.UpdateFont(textStyle, fontManager);
+			nativeButton.TitleLabel.UpdateFont(textStyle, fontManager, UIFont.ButtonFontSize);
 		}
 
 		public static void UpdatePadding(this UIButton nativeButton, IButton button)
diff --git a/src/Core/src/Platform/iOS/CollapseConstraint.cs b/src/Core/src/Platform/iOS/CollapseConstraint.cs
new file mode 100644
index 000000000000..d91c8f3dbb41
--- /dev/null
+++ b/src/Core/src/Platform/iOS/CollapseConstraint.cs
@@ -0,0 +1,15 @@
+using System;
+using UIKit;
+
+namespace Microsoft.Maui
+{
+	/// <summary>
+	/// Constraint which forces a UIView's height to zero
+	/// </summary>
+	internal class CollapseConstraint : NSLayoutConstraint 
+	{
+		public override NSLayoutRelation Relation => NSLayoutRelation.Equal;
+		public override NSLayoutAttribute FirstAttribute => NSLayoutAttribute.Height;
+		public override nfloat Multiplier => 0;
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Platform/MaciOS/ColorExtensions.cs b/src/Core/src/Platform/iOS/ColorExtensions.cs
similarity index 65%
rename from src/Core/src/Platform/MaciOS/ColorExtensions.cs
rename to src/Core/src/Platform/iOS/ColorExtensions.cs
index 059f03649d73..a88117f2ea30 100644
--- a/src/Core/src/Platform/MaciOS/ColorExtensions.cs
+++ b/src/Core/src/Platform/iOS/ColorExtensions.cs
@@ -1,22 +1,13 @@
+using System;
 using CoreGraphics;
-using Microsoft.Maui;
 using Microsoft.Maui.Graphics;
-using Microsoft.Maui.Graphics.CoreGraphics;
-using System;
-
-#if __IOS__
 using UIKit;
 using UIColor = UIKit.UIColor;
-#else
-using AppKit;
-using UIColor = AppKit.NSColor;
-#endif
 
 namespace Microsoft.Maui
 {
 	public static class ColorExtensions
 	{
-#if __IOS__
 		internal static readonly UIColor Black = UIColor.Black;
 		internal static readonly UIColor SeventyPercentGrey = new UIColor(0.7f, 0.7f, 0.7f, 1);
 
@@ -144,19 +135,11 @@ internal static UIColor LightGray
 			}
 		}
 
-#else
-		internal static readonly UIColor Black = UIColor.Black;
-		internal static readonly UIColor SeventyPercentGrey = UIColor.FromRgba(0.7f, 0.7f, 0.7f, 1);
-		internal static readonly UIColor LabelColor = UIColor.Black.UsingColorSpace(NSColorSpace.DeviceRGB);
-		internal static readonly UIColor AccentColor = Color.FromRgba(50, 79, 133, 255).ToNative();
-#endif
-
 		public static CGColor ToCGColor(this Color color)
 		{
 			return color.ToNative().CGColor;
 		}
 
-#if __IOS__
 		public static UIColor FromPatternImageFromBundle(string bgImage)
 		{
 			var image = UIImage.FromBundle(bgImage);
@@ -165,40 +148,17 @@ public static UIColor FromPatternImageFromBundle(string bgImage)
 
 			return UIColor.FromPatternImage(image);
 		}
-#endif
 
 		public static Color? ToColor(this UIColor color)
 		{
-			nfloat red;
-			nfloat green;
-			nfloat blue;
-			nfloat alpha;
-
 			if (color == null)
 				return null;
-#if __IOS__
-			color.GetRGBA(out red, out green, out blue, out alpha);
-#else
-			if (color.Type == NSColorType.Catalog)
-				color = UIColor.Black.UsingColorSpace(NSColorSpace.DeviceRGB);
-			// TODO:
-			//throw new InvalidOperationException("Cannot convert a NSColorType.Catalog color without specifying the color space, use the overload to specify an NSColorSpace");
-
-			color.GetRgba(out red, out green, out blue, out alpha);
-#endif
-			return new Color((float)red, (float)green, (float)blue, (float)alpha);
-		}
 
-#if __MACOS__
-		public static Color ToColor(this UIColor color, NSColorSpace colorSpace)
-		{
-			var convertedColor = color.UsingColorSpace(colorSpace);
+			color.GetRGBA(out nfloat red, out nfloat green, out nfloat blue, out nfloat alpha);
 
-			return convertedColor.ToColor();
+			return new Color((float)red, (float)green, (float)blue, (float)alpha);
 		}
-#endif
 
-#if __IOS__
 		public static UIColor ToNative(this Color color)
 		{
 			return new UIColor(color.Red, color.Green, color.Blue, color.Alpha);
@@ -209,17 +169,5 @@ public static UIColor ToNative(this Color color)
 
 		public static UIColor ToNative(this Color? color, UIColor defaultColor)
 			=> color?.ToNative() ?? defaultColor;
-#else
-		public static NSColor ToNative(this Color? color)
-		{
-			return NSColor.FromRgba((float)color.R, (float)color.G, (float)color.B, (float)color.A);
-		}
-
-		public static NSColor? ToNative(this Color? color, Color? defaultColor)
-			=> color?.ToNative() ?? defaultColor?.ToNative();
-
-		public static NSColor ToNative(this Color? color, NSColor defaultColor)
-			=> color?.ToNative() ?? defaultColor;
-#endif
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Platform/iOS/ContainerViewController.cs b/src/Core/src/Platform/iOS/ContainerViewController.cs
index e2721f072504..bf43a96b941d 100644
--- a/src/Core/src/Platform/iOS/ContainerViewController.cs
+++ b/src/Core/src/Platform/iOS/ContainerViewController.cs
@@ -1,6 +1,6 @@
 using System;
-using UIKit;
 using Microsoft.Maui.HotReload;
+using UIKit;
 namespace Microsoft.Maui
 {
 	public class ContainerViewController : UIViewController, IReloadHandler
@@ -11,15 +11,28 @@ public IView? CurrentView
 			get => _view;
 			set => SetView(value);
 		}
+
+		public UIView? CurrentNativeView
+			=> _pendingLoadedView ?? currentNativeView;
+
 		public IMauiContext? Context { get; set; }
 
 		UIView? currentNativeView;
+
+		// The handler needs this view before LoadView is called on the controller
+		// So this is used to create the first view that the handler will use
+		// without forcing the VC to call LoadView
+		UIView? _pendingLoadedView;
+
 		void SetView(IView? view, bool forceRefresh = false)
 		{
 			if (view == _view && !forceRefresh)
 				return;
 			_view = view;
 
+			if (view is IPage page)
+				Title = page.Title;
+
 			if (_view is IHotReloadableView ihr)
 			{
 				ihr.ReloadHandler = this;
@@ -28,18 +41,39 @@ void SetView(IView? view, bool forceRefresh = false)
 			currentNativeView?.RemoveFromSuperview();
 			currentNativeView = null;
 			if (IsViewLoaded && _view != null)
-			{
-				_ = Context ?? throw new ArgumentNullException(nameof(Context));
-				View!.AddSubview(currentNativeView = _view.ToNative(Context));
-			}
+				LoadNativeView(_view);
+		}
+
+		internal UIView LoadFirstView(IView view)
+		{
+			_pendingLoadedView = CreateNativeView(view);
+			return _pendingLoadedView;
 		}
 
 		public override void LoadView()
 		{
 			base.LoadView();
 			if (_view != null && Context != null)
-				View!.AddSubview(currentNativeView = _view.ToNative(Context));
+				LoadNativeView(_view);
+		}
+
+		void LoadNativeView(IView view)
+		{
+			currentNativeView = _pendingLoadedView ?? CreateNativeView(view);
+			_pendingLoadedView = null;
+			View!.AddSubview(currentNativeView);
+			if (view.Background == null)
+				View.BackgroundColor = UIColor.SystemBackgroundColor;
 		}
+
+		protected virtual UIView CreateNativeView(IView view)
+		{
+			_ = Context ?? throw new ArgumentNullException(nameof(Context));
+			_ = _view ?? throw new ArgumentNullException(nameof(view));
+
+			return _view.ToNative(Context);
+		}
+
 		public override void ViewDidLayoutSubviews()
 		{
 			base.ViewDidLayoutSubviews();
diff --git a/src/Core/src/Platform/MaciOS/CoreGraphicsExtensions.cs b/src/Core/src/Platform/iOS/CoreGraphicsExtensions.cs
similarity index 78%
rename from src/Core/src/Platform/MaciOS/CoreGraphicsExtensions.cs
rename to src/Core/src/Platform/iOS/CoreGraphicsExtensions.cs
index b3c98a9428dd..c1d767db41ab 100644
--- a/src/Core/src/Platform/MaciOS/CoreGraphicsExtensions.cs
+++ b/src/Core/src/Platform/iOS/CoreGraphicsExtensions.cs
@@ -1,3 +1,4 @@
+using System;
 using CoreGraphics;
 using Microsoft.Maui;
 using Microsoft.Maui.Graphics;
@@ -30,5 +31,11 @@ public static CGRect ToCGRect(this Rectangle rect)
 		{
 			return new CGRect(rect.X, rect.Y, rect.Width, rect.Height);
 		}
+
+		public static bool IsCloseTo(this CGSize size0, CGSize size1, nfloat tolerance)
+		{
+			var diff = size0 - size1;
+			return Math.Abs(diff.Width) < tolerance && Math.Abs(diff.Height) < tolerance;
+		}
 	}
 }
diff --git a/src/Core/src/Platform/MaciOS/DateExtensions.cs b/src/Core/src/Platform/iOS/DateExtensions.cs
similarity index 100%
rename from src/Core/src/Platform/MaciOS/DateExtensions.cs
rename to src/Core/src/Platform/iOS/DateExtensions.cs
diff --git a/src/Core/src/Platform/iOS/HandlerExtensions.cs b/src/Core/src/Platform/iOS/HandlerExtensions.cs
index 55b26710ecce..a519d346bd47 100644
--- a/src/Core/src/Platform/iOS/HandlerExtensions.cs
+++ b/src/Core/src/Platform/iOS/HandlerExtensions.cs
@@ -6,7 +6,14 @@ namespace Microsoft.Maui
 {
 	public static class HandlerExtensions
 	{
-		public static UIViewController ToUIViewController(this IView view, IMauiContext context) => new ContainerViewController { CurrentView = view, Context = context };
+		public static UIViewController ToUIViewController(this IView view, IMauiContext context)
+		{
+			var nativeView = view.ToNative(context);
+			if (view?.Handler is INativeViewHandler nvh && nvh.ViewController != null)
+				return nvh.ViewController;
+
+			return new ContainerViewController { CurrentView = view, Context = context };
+		}
 
 		public static UIView ToNative(this IView view, IMauiContext context)
 		{
diff --git a/src/Core/src/Platform/iOS/ImageViewExtensions.cs b/src/Core/src/Platform/iOS/ImageViewExtensions.cs
new file mode 100644
index 000000000000..7c5204c055b4
--- /dev/null
+++ b/src/Core/src/Platform/iOS/ImageViewExtensions.cs
@@ -0,0 +1,93 @@
+#nullable enable
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using UIKit;
+
+namespace Microsoft.Maui
+{
+	public static class ImageViewExtensions
+	{
+		public static void Clear(this UIImageView imageView)
+		{
+			imageView.Image = null;
+		}
+
+		public static void UpdateAspect(this UIImageView imageView, IImage image)
+		{
+			imageView.ContentMode = image.Aspect.ToUIViewContentMode();
+		}
+
+		public static void UpdateIsAnimationPlaying(this UIImageView imageView, IImageSourcePart image)
+		{
+			if (image.IsAnimationPlaying)
+			{
+				if (!imageView.IsAnimating)
+					imageView.StartAnimating();
+			}
+			else
+			{
+				if (imageView.IsAnimating)
+					imageView.StopAnimating();
+			}
+		}
+
+		public static async Task<IImageSourceServiceResult<UIImage>?> UpdateSourceAsync(this UIImageView imageView, IImageSourcePart image, IImageSourceServiceProvider services, CancellationToken cancellationToken = default)
+		{
+			imageView.Clear();
+
+			image.UpdateIsLoading(false);
+
+			var imageSource = image.Source;
+			if (imageSource == null)
+				return null;
+
+			var events = image as IImageSourcePartEvents;
+
+			events?.LoadingStarted();
+			image.UpdateIsLoading(true);
+
+			try
+			{
+				var service = services.GetRequiredImageSourceService(imageSource);
+
+				var scale = imageView.Window?.Screen?.Scale ?? 1;
+				var result = await service.GetImageAsync(imageSource, (float)scale, cancellationToken);
+				var uiImage = result?.Value;
+
+				var applied = !cancellationToken.IsCancellationRequested && imageSource == image.Source;
+
+				// only set the image if we are still on the same one
+				if (applied)
+				{
+					imageView.Image = uiImage;
+
+					imageView.UpdateIsAnimationPlaying(image);
+				}
+
+				events?.LoadingCompleted(applied);
+
+				return result;
+			}
+			catch (OperationCanceledException)
+			{
+				// no-op
+				events?.LoadingCompleted(false);
+			}
+			catch (Exception ex)
+			{
+				events?.LoadingFailed(ex);
+			}
+			finally
+			{
+				// only mark as finished if we are still working on the same image
+				if (imageSource == image.Source)
+				{
+					image.UpdateIsLoading(false);
+				}
+			}
+
+			return null;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Platform/iOS/LabelExtensions.cs b/src/Core/src/Platform/iOS/LabelExtensions.cs
index 01a34d4f2e6f..a9cc47a484c6 100644
--- a/src/Core/src/Platform/iOS/LabelExtensions.cs
+++ b/src/Core/src/Platform/iOS/LabelExtensions.cs
@@ -1,3 +1,4 @@
+using Microsoft.Maui.Graphics;
 using Microsoft.Maui.Platform.iOS;
 using UIKit;
 
@@ -5,6 +6,11 @@ namespace Microsoft.Maui
 {
 	public static class LabelExtensions
 	{
+		public static void UpdateBackground(this MauiLabel nativeLabel, ILabel label)
+		{
+			nativeLabel.BackgroundLayer = label.Background?.ToCALayer();
+		}
+
 		public static void UpdateText(this UILabel nativeLabel, ILabel label)
 		{
 			nativeLabel.Text = label.Text;
@@ -24,18 +30,18 @@ public static void UpdateCharacterSpacing(this UILabel nativeLabel, ITextStyle t
 				nativeLabel.AttributedText = textAttr;
 		}
 
-		public static void UpdateFont(this UILabel nativeLabel, ITextStyle textStyle, IFontManager fontManager)
+		public static void UpdateFont(this UILabel nativeLabel, ITextStyle textStyle, IFontManager fontManager) =>
+			nativeLabel.UpdateFont(textStyle, fontManager, UIFont.LabelFontSize);
+
+		public static void UpdateFont(this UILabel nativeLabel, ITextStyle textStyle, IFontManager fontManager, double defaultSize)
 		{
-			var uiFont = fontManager.GetFont(textStyle.Font);
+			var uiFont = fontManager.GetFont(textStyle.Font, defaultSize);
 			nativeLabel.Font = uiFont;
 		}
 
 		public static void UpdateHorizontalTextAlignment(this UILabel nativeLabel, ILabel label)
 		{
-			// We don't have a FlowDirection yet, so there's nothing to pass in here. 
-			// TODO ezhart Update this when FlowDirection is available 
-			// (or update the extension to take an ILabel instead of an alignment and work it out from there) 
-			nativeLabel.TextAlignment = label.HorizontalTextAlignment.ToNative(true);
+			nativeLabel.TextAlignment = label.HorizontalTextAlignment.ToNative(label.FlowDirection == FlowDirection.LeftToRight);
 		}
 
 		public static void UpdateLineBreakMode(this UILabel nativeLabel, ILabel label)
diff --git a/src/Core/src/Platform/iOS/LayoutView.cs b/src/Core/src/Platform/iOS/LayoutView.cs
index 88107faf8651..51f57a6fc7ce 100644
--- a/src/Core/src/Platform/iOS/LayoutView.cs
+++ b/src/Core/src/Platform/iOS/LayoutView.cs
@@ -1,7 +1,7 @@
 using System;
 using CoreGraphics;
-using Microsoft.Maui;
 using Microsoft.Maui.Graphics;
+using ObjCRuntime;
 using UIKit;
 
 namespace Microsoft.Maui
@@ -23,15 +23,31 @@ public override CGSize SizeThatFits(CGSize size)
 			return base.SizeThatFits(crossPlatformSize.ToCGSize());
 		}
 
+		public IView? View { get; set; }
+
 		public override void LayoutSubviews()
 		{
 			base.LayoutSubviews();
 
-			var width = Frame.Width;
-			var height = Frame.Height;
+			var bounds = Frame.ToRectangle();
+			if (View is ISafeAreaView sav && !sav.IgnoreSafeArea && RespondsToSafeArea())
+			{
+				var safe = SafeAreaInsets;
+				bounds.X += safe.Left;
+				bounds.Y += safe.Top;
+				bounds.Height -= safe.Top + safe.Bottom;
+				bounds.Width -= safe.Left + safe.Right;
+			}
 
-			CrossPlatformMeasure?.Invoke(width, height);
-			CrossPlatformArrange?.Invoke(Frame.ToRectangle());
+			CrossPlatformMeasure?.Invoke(bounds.Width, bounds.Height);
+			CrossPlatformArrange?.Invoke(bounds);
+		}
+		static bool? respondsToSafeArea;
+		bool RespondsToSafeArea()
+		{
+			if (respondsToSafeArea.HasValue)
+				return respondsToSafeArea.Value;
+			return (bool)(respondsToSafeArea = this.RespondsToSelector(new Selector("safeAreaInsets")));
 		}
 
 		internal Func<double, double, Size>? CrossPlatformMeasure { get; set; }
@@ -57,4 +73,22 @@ public override void LayoutSubviews()
 
 		internal Func<Rectangle, Size>? CrossPlatformArrange { get; set; }
 	}
+
+	public class PageViewController : ContainerViewController
+	{
+		public PageViewController(IPage page, IMauiContext mauiContext)
+		{
+			CurrentView = page;
+			Context = mauiContext;
+			LoadFirstView(page);
+		}
+
+		protected override UIView CreateNativeView(IView view)
+		{
+			return new PageView
+			{
+				CrossPlatformArrange = view.Arrange,
+			};
+		}
+	}
 }
diff --git a/src/Core/src/Platform/iOS/MauiImageView.cs b/src/Core/src/Platform/iOS/MauiImageView.cs
new file mode 100644
index 000000000000..0d2ed510f14d
--- /dev/null
+++ b/src/Core/src/Platform/iOS/MauiImageView.cs
@@ -0,0 +1,23 @@
+using System;
+using CoreGraphics;
+using UIKit;
+
+namespace Microsoft.Maui.Platform.iOS
+{
+	public class MauiImageView : UIImageView
+	{
+		public MauiImageView()
+		{
+		}
+
+		public MauiImageView(CGRect frame)
+			: base(frame)
+		{
+		}
+
+		public override void MovedToWindow() =>
+			WindowChanged?.Invoke(this, EventArgs.Empty);
+
+		public event EventHandler? WindowChanged;
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Platform/iOS/MauiLabel.cs b/src/Core/src/Platform/iOS/MauiLabel.cs
index 1697752d6d6b..5ea1a2c46f37 100644
--- a/src/Core/src/Platform/iOS/MauiLabel.cs
+++ b/src/Core/src/Platform/iOS/MauiLabel.cs
@@ -1,4 +1,6 @@
-using CoreGraphics;
+using System;
+using CoreAnimation;
+using CoreGraphics;
 using UIKit;
 
 namespace Microsoft.Maui.Platform.iOS
@@ -7,6 +9,8 @@ public class MauiLabel : UILabel
 	{
 		public UIEdgeInsets TextInsets { get; set; }
 
+		public CALayer? BackgroundLayer { get; set; }
+
 		public MauiLabel(CGRect frame) : base(frame)
 		{
 		}
@@ -15,7 +19,39 @@ public MauiLabel()
 		{
 		}
 
-		public override void DrawText(CGRect rect) => base.DrawText(TextInsets.InsetRect(rect));
+		public override void DrawText(CGRect rect)
+		{
+			if (BackgroundLayer != null)
+			{
+				var context = UIGraphics.GetCurrentContext();
+				context.SaveState();
+
+				BackgroundLayer.Frame = Bounds;
+				BackgroundLayer.RenderInContext(context);
+
+				context.RestoreState();
+			}
+
+			base.DrawText(TextInsets.InsetRect(rect));
+		}
+
+		public override void InvalidateIntrinsicContentSize()
+		{
+			base.InvalidateIntrinsicContentSize();
+
+			if (Frame.Width == 0 && Frame.Height == 0)
+			{
+				// The Label hasn't actually been laid out on screen yet; no reason to request a layout
+				return;
+			}
+
+			if (!Frame.Size.IsCloseTo(AddInsets(IntrinsicContentSize), (nfloat)0.001))
+			{
+				// The text or its attributes have changed enough that the size no longer matches the set Frame. It's possible
+				// that the Label needs to be laid out again at a different size, so we request that the parent do so. 
+				Superview?.SetNeedsLayout();
+			}
+		}
 
 		public override CGSize SizeThatFits(CGSize size) => AddInsets(base.SizeThatFits(size));
 
@@ -23,4 +59,4 @@ public MauiLabel()
 			width: size.Width + TextInsets.Left + TextInsets.Right,
 			height: size.Height + TextInsets.Top + TextInsets.Bottom);
 	}
-}
+}
\ No newline at end of file
diff --git a/src/Core/src/Platform/iOS/MauiPicker.cs b/src/Core/src/Platform/iOS/MauiPicker.cs
index aac726ed4419..dbec98a01e1f 100644
--- a/src/Core/src/Platform/iOS/MauiPicker.cs
+++ b/src/Core/src/Platform/iOS/MauiPicker.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+#nullable enable
+using System.Collections.Generic;
 using Foundation;
 using ObjCRuntime;
 using UIKit;
diff --git a/src/Core/src/Platform/iOS/MauiUIApplicationDelegate.cs b/src/Core/src/Platform/iOS/MauiUIApplicationDelegate.cs
index 6ac6c2f804ec..856b5382302c 100644
--- a/src/Core/src/Platform/iOS/MauiUIApplicationDelegate.cs
+++ b/src/Core/src/Platform/iOS/MauiUIApplicationDelegate.cs
@@ -28,13 +28,12 @@ public override bool FinishedLaunching(UIApplication application, NSDictionary l
 
 			var activationState = new ActivationState(mauiContext);
 			var window = Application.CreateWindow(activationState);
-			window.MauiContext = mauiContext;
 
-			var page = window.Page;
+			var page = window.View;
 
 			Window = new UIWindow
 			{
-				RootViewController = page.ToUIViewController(window.MauiContext),
+				RootViewController = window.View.ToUIViewController(mauiContext)
 			};
 
 			Window.MakeKeyAndVisible();
@@ -119,4 +118,4 @@ protected MauiUIApplicationDelegate()
 
 		public IApplication Application { get; protected set; } = null!;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Core/src/Platform/iOS/PickerExtensions.cs b/src/Core/src/Platform/iOS/PickerExtensions.cs
index 44bc685c27b8..ce7c0447cd89 100644
--- a/src/Core/src/Platform/iOS/PickerExtensions.cs
+++ b/src/Core/src/Platform/iOS/PickerExtensions.cs
@@ -1,4 +1,5 @@
-using System;
+#nullable enable
+using System;
 using Microsoft.Maui.Handlers;
 
 namespace Microsoft.Maui
@@ -14,18 +15,16 @@ public static void UpdateSelectedIndex(this MauiPicker nativePicker, IPicker pic
 		internal static void UpdatePicker(this MauiPicker nativePicker, IPicker picker)
 		{
 			var selectedIndex = picker.SelectedIndex;
-			var items = picker.Items;
 
-			nativePicker.Text = selectedIndex == -1 || items == null || selectedIndex >= items.Count ? string.Empty : items[selectedIndex];
+			nativePicker.Text = selectedIndex == -1 ? "" : picker.GetItem(selectedIndex);
 
 			var pickerView = nativePicker.UIPickerView;
 			pickerView?.ReloadAllComponents();
 
-			if (items == null || items.Count == 0)
+			if (picker.GetCount() == 0)
 				return;
 
 			nativePicker.SetSelectedIndex(picker, selectedIndex);
-			nativePicker.SetSelectedItem(picker);
 		}
 
 		internal static void SetSelectedIndex(this MauiPicker nativePicker, IPicker picker, int selectedIndex = 0)
@@ -37,32 +36,10 @@ internal static void SetSelectedIndex(this MauiPicker nativePicker, IPicker pick
 			if (pickerView?.Model is PickerSource source)
 			{
 				source.SelectedIndex = selectedIndex;
-				source.SelectedItem = (selectedIndex >= 0 && picker.Items.Count > selectedIndex) ? picker.Items[selectedIndex] : null;
 			}
 
 			pickerView?.Select(Math.Max(selectedIndex, 0), 0, true);
 		}
 
-		internal static void SetSelectedItem(this MauiPicker nativePicker, IPicker picker)
-		{
-			if (nativePicker == null)
-				return;
-
-			int index = picker.SelectedIndex;
-
-			if (index == -1)
-			{
-				picker.SelectedItem = null;
-				return;
-			}
-
-			if (picker.ItemsSource != null)
-			{
-				picker.SelectedItem = picker.ItemsSource[index];
-				return;
-			}
-
-			picker.SelectedItem = picker.Items[index];
-		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Platform/iOS/TextFieldExtensions.cs b/src/Core/src/Platform/iOS/TextFieldExtensions.cs
index ee936d3d9ba5..ad8f2a3b32ef 100644
--- a/src/Core/src/Platform/iOS/TextFieldExtensions.cs
+++ b/src/Core/src/Platform/iOS/TextFieldExtensions.cs
@@ -65,7 +65,7 @@ public static void UpdateIsReadOnly(this UITextField textField, IEntry entry)
 
 		public static void UpdateFont(this UITextField textField, ITextStyle textStyle, IFontManager fontManager)
 		{
-			var uiFont = fontManager.GetFont(textStyle.Font);
+			var uiFont = fontManager.GetFont(textStyle.Font, UIFont.LabelFontSize);
 			textField.Font = uiFont;
 		}
 
diff --git a/src/Core/src/Platform/iOS/TextViewExtensions.cs b/src/Core/src/Platform/iOS/TextViewExtensions.cs
index 4c8b108d4aed..b229c1320281 100644
--- a/src/Core/src/Platform/iOS/TextViewExtensions.cs
+++ b/src/Core/src/Platform/iOS/TextViewExtensions.cs
@@ -48,7 +48,7 @@ public static void UpdatePredictiveText(this UITextView textView, IEditor editor
 
 		public static void UpdateFont(this UITextView textView, ITextStyle textStyle, IFontManager fontManager)
 		{
-			var uiFont = fontManager.GetFont(textStyle.Font);
+			var uiFont = fontManager.GetFont(textStyle.Font, UIFont.LabelFontSize);
 			textView.Font = uiFont;
 		}
 
diff --git a/src/Core/src/Platform/iOS/ViewExtensions.cs b/src/Core/src/Platform/iOS/ViewExtensions.cs
index a78297a83b7b..692d17d036ad 100644
--- a/src/Core/src/Platform/iOS/ViewExtensions.cs
+++ b/src/Core/src/Platform/iOS/ViewExtensions.cs
@@ -1,30 +1,77 @@
 using System.Collections.Generic;
+using CoreAnimation;
+using Microsoft.Maui.Graphics;
 using UIKit;
 
 namespace Microsoft.Maui
 {
 	public static class ViewExtensions
 	{
+		const string BackgroundLayerName = "MauiBackgroundLayer";
+
 		public static UIColor? GetBackgroundColor(this UIView view)
 			=> view?.BackgroundColor;
 
 		public static void UpdateIsEnabled(this UIView nativeView, IView view)
 		{
-			if (!(nativeView is UIControl uiControl))
+			if (nativeView is not UIControl uiControl)
 				return;
 
 			uiControl.Enabled = view.IsEnabled;
 		}
 
-		public static void UpdateBackgroundColor(this UIView nativeView, IView view)
+		public static void UpdateVisibility(this UIView nativeView, IView view)
+		{
+			var shouldLayout = false;
+
+			switch (view.Visibility)
+			{
+				case Visibility.Visible:
+					shouldLayout = nativeView.Inflate();
+					nativeView.Hidden = false;
+					break;
+				case Visibility.Hidden:
+					shouldLayout = nativeView.Inflate();
+					nativeView.Hidden = true;
+					break;
+				case Visibility.Collapsed:
+					nativeView.Hidden = true;
+					nativeView.Collapse();
+					shouldLayout = true;
+					break;
+			}
+
+			// If the view is just switching between Visible and Hidden, then a re-layout isn't necessary. The return value
+			// from Inflate will tell us if the view was previously collapsed. If the view is switching to or from a collapsed
+			// state, then we'll have to ask for a re-layout.
+
+			if (shouldLayout)
+			{
+				nativeView.Superview?.SetNeedsLayout();
+			}
+		}
+
+		public static void UpdateBackground(this UIView nativeView, IView view)
 		{
 			if (nativeView == null)
 				return;
 
-			var color = view.BackgroundColor;
+			// Remove previous background gradient layer if any
+			nativeView.RemoveBackgroundLayer();
 
-			if (color != null)
-				nativeView.BackgroundColor = color.ToNative();
+			var paint = view.Background;
+
+			if (paint.IsNullOrEmpty())
+				return;
+
+			var backgroundLayer = paint?.ToCALayer(nativeView.Bounds);
+
+			if (backgroundLayer != null)
+			{
+				backgroundLayer.Name = BackgroundLayerName;
+				nativeView.BackgroundColor = UIColor.Clear;
+				nativeView.InsertBackgroundLayer(backgroundLayer, 0);
+			}
 		}
 
 		public static void UpdateAutomationId(this UIView nativeView, IView view) =>
@@ -33,6 +80,7 @@ public static void UpdateAutomationId(this UIView nativeView, IView view) =>
 		public static void UpdateSemantics(this UIView nativeView, IView view)
 		{
 			var semantics = view.Semantics;
+
 			if (semantics == null)
 				return;
 
@@ -63,5 +111,135 @@ public static void UpdateSemantics(this UIView nativeView, IView view)
 
 			return null;
 		}
+
+		public static void UpdateBackgroundLayerFrame(this UIView view)
+		{
+			if (view == null || view.Frame.IsEmpty)
+				return;
+
+			var layer = view.Layer;
+
+			if (layer == null || layer.Sublayers == null)
+				return;
+
+			foreach (var sublayer in layer.Sublayers)
+			{
+				if (sublayer.Name == BackgroundLayerName && sublayer.Frame != view.Bounds)
+				{
+					sublayer.Frame = view.Bounds;
+					break;
+				}
+			}
+		}
+
+		public static void InvalidateMeasure(this UIView nativeView, IView view)
+		{
+			nativeView.SetNeedsLayout();
+		}
+
+		public static void UpdateWidth(this UIView nativeView, IView view)
+		{
+			if (view.Width == -1)
+			{
+				// Ignore the initial set of the height; the initial layout will take care of it
+				return;
+			}
+
+			UpdateFrame(nativeView, view);
+		}
+
+		public static void UpdateHeight(this UIView nativeView, IView view)
+		{
+			if (view.Height == -1)
+			{
+				// Ignore the initial set of the height; the initial layout will take care of it
+				return;
+			}
+
+			UpdateFrame(nativeView, view);
+		}
+
+		public static void UpdateFrame(UIView nativeView, IView view)
+		{
+			// Updating the frame (assuming it's an actual change) will kick off a layout update
+			// Handling of the default (-1) width/height will be taken care of by GetDesiredSize
+			var currentFrame = nativeView.Frame;
+			nativeView.Frame = new CoreGraphics.CGRect(currentFrame.X, currentFrame.Y, view.Width, view.Height);
+		}
+
+		internal static void Collapse(this UIView view)
+		{
+			// See if this view already has a collapse constraint we can use
+			foreach (var constraint in view.Constraints)
+			{
+				if (constraint is CollapseConstraint collapseConstraint)
+				{
+					// Active the collapse constraint; that will squish the view down to zero height
+					collapseConstraint.Active = true;
+					return;
+				}
+			}
+
+			// Set up a collapse constraint and turn it on
+			var collapse = new CollapseConstraint();
+			view.AddConstraint(collapse);
+			collapse.Active = true;
+		}
+
+		internal static bool Inflate(this UIView view)
+		{
+			// Find and deactivate the collapse constraint, if any; the view will go back to its normal height
+			foreach (var constraint in view.Constraints)
+			{
+				if (constraint is CollapseConstraint collapseConstraint)
+				{
+					collapseConstraint.Active = false;
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		static void InsertBackgroundLayer(this UIView control, CALayer backgroundLayer, int index = -1)
+		{
+			control.RemoveBackgroundLayer();
+
+			if (backgroundLayer != null)
+			{
+				var layer = control.Layer;
+
+				if (index > -1)
+					layer.InsertSublayer(backgroundLayer, index);
+				else
+					layer.AddSublayer(backgroundLayer);
+			}
+		}
+
+		static void RemoveBackgroundLayer(this UIView control)
+		{
+			var layer = control.Layer;
+
+			if (layer == null)
+				return;
+
+			if (layer.Name == BackgroundLayerName)
+			{
+				layer.RemoveFromSuperLayer();
+				return;
+			}
+
+			if (layer.Sublayers == null || layer.Sublayers.Length == 0)
+				return;
+
+			foreach (var subLayer in layer.Sublayers)
+			{
+				if (subLayer.Name == BackgroundLayerName)
+				{
+					subLayer.RemoveFromSuperLayer();
+					break;
+				}
+			}
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Controls/src/Core/Aspect.cs b/src/Core/src/Primitives/Aspect.cs
similarity index 57%
rename from src/Controls/src/Core/Aspect.cs
rename to src/Core/src/Primitives/Aspect.cs
index 05ee4d81a678..199fdff888e2 100644
--- a/src/Controls/src/Core/Aspect.cs
+++ b/src/Core/src/Primitives/Aspect.cs
@@ -1,9 +1,10 @@
-namespace Microsoft.Maui.Controls
+namespace Microsoft.Maui
 {
 	public enum Aspect
 	{
 		AspectFit,
 		AspectFill,
-		Fill
+		Fill,
+		Center
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Primitives/Font.cs b/src/Core/src/Primitives/Font.cs
index aea8e396f5f2..43f8784bd98a 100644
--- a/src/Core/src/Primitives/Font.cs
+++ b/src/Core/src/Primitives/Font.cs
@@ -9,82 +9,55 @@ public struct Font
 
 		public double FontSize { get; private set; }
 
-		public NamedSize NamedSize { get; private set; }
+		public FontSlant FontSlant { get; private set; }
 
-		public FontAttributes FontAttributes { get; private set; }
+		public bool IsDefault => FontFamily == null && FontSize == 0 && FontSlant == FontSlant.Default && Weight == FontWeight.Regular;
 
-		public bool IsDefault
-		{
-			get { return FontFamily == null && FontSize == 0 && NamedSize == NamedSize.Default && FontAttributes == FontAttributes.None; }
-		}
+		static Font _default = default(Font).WithWeight(FontWeight.Regular);
+		public static Font Default => _default;
 
-		public bool UseNamedSize
+		FontWeight _weight;
+		public FontWeight Weight
 		{
-			get { return FontSize <= 0; }
-		}
-
-		public static Font Default
-		{
-			get { return default(Font); }
+			get => _weight <= 0 ? FontWeight.Regular : _weight;
+			private set => _weight = value;
 		}
 
 		public Font WithSize(double size)
 		{
-			return new Font { FontFamily = FontFamily, FontSize = size, NamedSize = 0, FontAttributes = FontAttributes };
-		}
-
-		public Font WithSize(NamedSize size)
-		{
-			if (size <= 0)
-				throw new ArgumentOutOfRangeException("size");
-
-			return new Font { FontFamily = FontFamily, FontSize = 0, NamedSize = size, FontAttributes = FontAttributes };
+			return new Font { FontFamily = FontFamily, FontSize = size, FontSlant = FontSlant, Weight = Weight };
 		}
 
-		public Font WithAttributes(FontAttributes fontAttributes)
+		public Font WithSlant(FontSlant fontSlant)
 		{
-			return new Font { FontFamily = FontFamily, FontSize = FontSize, NamedSize = NamedSize, FontAttributes = fontAttributes };
+			return new Font { FontFamily = FontFamily, FontSize = FontSize, FontSlant = fontSlant, Weight = Weight };
 		}
 
-		public static Font OfSize(string name, double size)
+		public Font WithWeight(FontWeight weight)
 		{
-			var result = new Font { FontFamily = name, FontSize = size };
-			return result;
-		}
-
-		public static Font OfSize(string name, NamedSize size)
-		{
-			var result = new Font { FontFamily = name, NamedSize = size };
-			return result;
+			return new Font { FontFamily = FontFamily, FontSize = FontSize, FontSlant = FontSlant, Weight = weight };
 		}
 
-		public static Font SystemFontOfSize(double size)
+		public Font WithWeight(FontWeight weight, FontSlant fontSlant)
 		{
-			var result = new Font { FontSize = size };
-			return result;
+			return new Font { FontFamily = FontFamily, FontSize = FontSize, FontSlant = fontSlant, Weight = weight };
 		}
 
-		public static Font SystemFontOfSize(NamedSize size)
-		{
-			var result = new Font { NamedSize = size };
-			return result;
-		}
+		public static Font OfSize(string name, double size, FontWeight weight = FontWeight.Regular, FontSlant fontSlant = FontSlant.Default) =>
+			new() { FontFamily = name, FontSize = size, Weight = weight, FontSlant = fontSlant };
 
-		public static Font SystemFontOfSize(double size, FontAttributes attributes)
-		{
-			var result = new Font { FontSize = size, FontAttributes = attributes };
-			return result;
-		}
+		public static Font SystemFontOfSize(double size, FontWeight weight = FontWeight.Regular, FontSlant fontSlant = FontSlant.Default) =>
+			new() { FontSize = size, Weight = weight, FontSlant = fontSlant };
 
-		public static Font SystemFontOfSize(NamedSize size, FontAttributes attributes)
+		public static Font SystemFontOfWeight(FontWeight weight, FontSlant fontSlant = FontSlant.Default)
 		{
-			var result = new Font { NamedSize = size, FontAttributes = attributes };
+			var result = new Font { Weight = weight, FontSlant = fontSlant };
 			return result;
 		}
 
 		bool Equals(Font other)
 		{
-			return string.Equals(FontFamily, other.FontFamily) && FontSize.Equals(other.FontSize) && NamedSize == other.NamedSize && FontAttributes == other.FontAttributes;
+			return string.Equals(FontFamily, other.FontFamily) && FontSize.Equals(other.FontSize) && Weight == other.Weight && FontSlant == other.FontSlant;
 		}
 
 		public override bool Equals(object? obj)
@@ -100,18 +73,7 @@ public override bool Equals(object? obj)
 			return Equals((Font)obj);
 		}
 
-		public override int GetHashCode()
-		{
-			unchecked
-			{
-				int hashCode = FontFamily != null ? FontFamily.GetHashCode() : 0;
-				hashCode = (hashCode * 397) ^ FontSize.GetHashCode();
-				hashCode = (hashCode * 397) ^ NamedSize.GetHashCode();
-				hashCode = (hashCode * 397) ^ FontAttributes.GetHashCode();
-
-				return hashCode;
-			}
-		}
+		public override int GetHashCode() => (FontFamily, FontSize, Weight, FontSlant).GetHashCode();
 
 		public static bool operator ==(Font left, Font right)
 		{
@@ -124,8 +86,6 @@ public override int GetHashCode()
 		}
 
 		public override string ToString()
-		{
-			return string.Format("FontFamily: {0}, FontSize: {1}, NamedSize: {2}, FontAttributes: {3}", FontFamily, FontSize, NamedSize, FontAttributes);
-		}
+			=> $"FontFamily: {FontFamily}, FontSize: {FontSize}, Weight: {Weight}, FontSlant: {FontSlant}";
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Primitives/FontAttributes.cs b/src/Core/src/Primitives/FontAttributes.cs
deleted file mode 100644
index 78ca3830f44e..000000000000
--- a/src/Core/src/Primitives/FontAttributes.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-
-namespace Microsoft.Maui
-{
-	[Flags]
-	public enum FontAttributes
-	{
-		None = 0,
-		Bold = 1 << 0,
-		Italic = 1 << 1
-	}
-}
diff --git a/src/Core/src/Primitives/FontSlant.cs b/src/Core/src/Primitives/FontSlant.cs
new file mode 100644
index 000000000000..966c949629e0
--- /dev/null
+++ b/src/Core/src/Primitives/FontSlant.cs
@@ -0,0 +1,10 @@
+using System;
+namespace Microsoft.Maui
+{
+	public enum FontSlant
+	{
+		Default,
+		Italic,
+		Oblique
+	}
+}
diff --git a/src/Core/src/Primitives/FontWeight.cs b/src/Core/src/Primitives/FontWeight.cs
new file mode 100644
index 000000000000..8bd493e8ef16
--- /dev/null
+++ b/src/Core/src/Primitives/FontWeight.cs
@@ -0,0 +1,16 @@
+using System;
+namespace Microsoft.Maui
+{
+	public enum FontWeight
+	{
+		Regular = 400,
+		Thin = 100,
+		Ultralight = 200,
+		Light = 300,
+		Medium = 500,
+		Semibold = 600,
+		Bold = 700,
+		Heavy = 800,
+		Black = 900,
+	}
+}
diff --git a/src/Core/src/Primitives/IItemDelegate.cs b/src/Core/src/Primitives/IItemDelegate.cs
new file mode 100644
index 000000000000..2ee72ecc179e
--- /dev/null
+++ b/src/Core/src/Primitives/IItemDelegate.cs
@@ -0,0 +1,9 @@
+using System;
+namespace Microsoft.Maui
+{
+	public interface IItemDelegate<T>
+	{
+		int GetCount();
+		T GetItem(int index);
+	}
+}
diff --git a/src/Core/src/Primitives/ItemDelegateList.cs b/src/Core/src/Primitives/ItemDelegateList.cs
new file mode 100644
index 000000000000..fdffdbb06858
--- /dev/null
+++ b/src/Core/src/Primitives/ItemDelegateList.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace Microsoft.Maui
+{
+	public class ItemDelegateList<T> : IReadOnlyList<T>
+	{
+		public ItemDelegateList(IItemDelegate<T> itemDelegate)
+		{
+			ItemDelegate = itemDelegate;
+		}
+		public T this[int index] => ItemDelegate.GetItem(index);
+
+		public int Count => ItemDelegate.GetCount();
+
+		public IItemDelegate<T> ItemDelegate { get; }
+
+		public IEnumerator<T> GetEnumerator()
+		{
+			var count = ItemDelegate.GetCount();
+			for (var i = 0; i < count; i++)
+				yield return ItemDelegate.GetItem(i);
+		}
+
+		IEnumerator IEnumerable.GetEnumerator()
+		{
+			var count = ItemDelegate.GetCount();
+			for (var i = 0; i < count; i++)
+				yield return ItemDelegate.GetItem(i);
+		}
+	}
+}
diff --git a/src/Controls/src/Core/LockableObservableListWrapper.cs b/src/Core/src/Primitives/LockableObservableListWrapper.cs
similarity index 90%
rename from src/Controls/src/Core/LockableObservableListWrapper.cs
rename to src/Core/src/Primitives/LockableObservableListWrapper.cs
index b431c9354e6b..fa1c4bdc70ac 100644
--- a/src/Controls/src/Core/LockableObservableListWrapper.cs
+++ b/src/Core/src/Primitives/LockableObservableListWrapper.cs
@@ -1,26 +1,25 @@
+#nullable enable
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.ComponentModel;
-using System.Runtime.CompilerServices;
-using Microsoft.Maui.Controls.Internals;
 
-namespace Microsoft.Maui.Controls.Internals
+namespace Microsoft.Maui
 {
 	[EditorBrowsable(EditorBrowsableState.Never)]
 	public class LockableObservableListWrapper : IList<string>, ICollection<string>, INotifyCollectionChanged, INotifyPropertyChanged, IReadOnlyList<string>, IReadOnlyCollection<string>, IEnumerable<string>, IEnumerable
 	{
 		public readonly ObservableCollection<string> _list = new ObservableCollection<string>();
 
-		event NotifyCollectionChangedEventHandler INotifyCollectionChanged.CollectionChanged
+		event NotifyCollectionChangedEventHandler? INotifyCollectionChanged.CollectionChanged
 		{
 			add { ((INotifyCollectionChanged)_list).CollectionChanged += value; }
 			remove { ((INotifyCollectionChanged)_list).CollectionChanged -= value; }
 		}
 
-		event PropertyChangedEventHandler INotifyPropertyChanged.PropertyChanged
+		event PropertyChangedEventHandler? INotifyPropertyChanged.PropertyChanged
 		{
 			add { ((INotifyPropertyChanged)_list).PropertyChanged += value; }
 			remove { ((INotifyPropertyChanged)_list).PropertyChanged -= value; }
diff --git a/src/Core/src/Primitives/Visibility.cs b/src/Core/src/Primitives/Visibility.cs
new file mode 100644
index 000000000000..64cb6a11c125
--- /dev/null
+++ b/src/Core/src/Primitives/Visibility.cs
@@ -0,0 +1,9 @@
+namespace Microsoft.Maui
+{
+	public enum Visibility
+	{
+		Visible = 0,
+		Hidden = 1,
+		Collapsed = 2
+	}
+}
\ No newline at end of file
diff --git a/src/Core/src/Properties/AssemblyInfo.cs b/src/Core/src/Properties/AssemblyInfo.cs
index dec6a657a03a..26146d7ec690 100644
--- a/src/Core/src/Properties/AssemblyInfo.cs
+++ b/src/Core/src/Properties/AssemblyInfo.cs
@@ -1,7 +1,11 @@
 using System.Runtime.CompilerServices;
 
 [assembly: InternalsVisibleTo("iOSUnitTests")]
+[assembly: InternalsVisibleTo("Microsoft.Maui.Controls")]
 [assembly: InternalsVisibleTo("Microsoft.Maui.Controls.Compatibility")]
+[assembly: InternalsVisibleTo("Microsoft.Maui.Controls.Compatibility.Android")]
+[assembly: InternalsVisibleTo("Microsoft.Maui.Controls.Compatibility.iOS")]
+[assembly: InternalsVisibleTo("Microsoft.Maui.Controls.Compatibility.Windows")]
 [assembly: InternalsVisibleTo("Microsoft.Maui.Core.UnitTests")]
 [assembly: InternalsVisibleTo("Microsoft.Maui.Core.Android.UnitTests")]
 [assembly: InternalsVisibleTo("Microsoft.Maui.Xaml.UnitTests")]
diff --git a/src/Core/src/PropertyMapper.cs b/src/Core/src/PropertyMapper.cs
index 303e2d921c5b..c591ed124135 100644
--- a/src/Core/src/PropertyMapper.cs
+++ b/src/Core/src/PropertyMapper.cs
@@ -124,7 +124,6 @@ protected override void ClearKeyCache()
 			_cachedKeys = null;
 		}
 
-
 		public override (Action<IViewHandler, IFrameworkElement>? Action, bool RunOnUpdateAll) Get(string key)
 		{
 			if (_mapper.TryGetValue(key, out var action))
@@ -142,9 +141,6 @@ public void Add(string key, Action<TViewHandler, TVirtualView> action, bool igno
 		IEnumerator IEnumerable.GetEnumerator() => _mapper.GetEnumerator();
 	}
 
-
-
-
 	public class PropertyMapper<TVirtualView> : PropertyMapper<TVirtualView, IViewHandler>
 		where TVirtualView : IFrameworkElement
 	{
diff --git a/src/Core/src/TaskExtensions.cs b/src/Core/src/TaskExtensions.cs
new file mode 100644
index 000000000000..c64b53c8ff35
--- /dev/null
+++ b/src/Core/src/TaskExtensions.cs
@@ -0,0 +1,46 @@
+#nullable enable
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.Maui
+{
+	public static class TaskExtensions
+	{
+		public static async void FireAndForget(
+			this Task task,
+			Action<Exception>? errorCallback = null,
+			Action? finishedCallBack = null
+			)
+		{
+			try
+			{
+				await task.ConfigureAwait(false);
+			}
+			catch (Exception ex)
+			{
+				errorCallback?.Invoke(ex);
+			}
+			finally
+			{
+				finishedCallBack?.Invoke();
+			}
+		}
+
+		public static void FireAndForget(this Task task, ILogger? logger, [CallerMemberName] string? callerName = null) =>
+			task.FireAndForget(ex => Log(logger, ex, callerName));
+
+		public static void FireAndForget<T>(this Task task, T? viewHandler, [CallerMemberName] string? callerName = null)
+			where T : IViewHandler
+		{
+			task.FireAndForget(ex => Log(viewHandler?.CreateLogger<T>(), ex, callerName));
+		}
+
+		static ILogger? CreateLogger<T>(this IViewHandler? viewHandler) =>
+			viewHandler?.MauiContext?.Services?.CreateLogger<T>();
+
+		static void Log(ILogger? logger, Exception ex, string? callerName) =>
+			logger?.LogError(ex, "Unexpected exception in {Member}.", callerName);
+	}
+}
diff --git a/src/Core/tests/Benchmarks/Benchmarks/GetHandlersBenchmarker.cs b/src/Core/tests/Benchmarks/Benchmarks/GetHandlersBenchmarker.cs
index b4dabe6f95b0..2819b231fe6a 100644
--- a/src/Core/tests/Benchmarks/Benchmarks/GetHandlersBenchmarker.cs
+++ b/src/Core/tests/Benchmarks/Benchmarks/GetHandlersBenchmarker.cs
@@ -16,8 +16,8 @@ public class GetHandlersBenchmarker
 		[GlobalSetup(Target = nameof(GetHandlerUsingDI))]
 		public void SetupForDI()
 		{
-			_host = AppHostBuilder
-				.CreateDefaultAppBuilder()
+			_host = AppHost
+				.CreateDefaultBuilder()
 				.Build();
 		}
 
diff --git a/src/Core/tests/Benchmarks/Benchmarks/MauiServiceProviderBenchmarker.cs b/src/Core/tests/Benchmarks/Benchmarks/MauiServiceProviderBenchmarker.cs
index 0e284747448c..7dbcb582ca9f 100644
--- a/src/Core/tests/Benchmarks/Benchmarks/MauiServiceProviderBenchmarker.cs
+++ b/src/Core/tests/Benchmarks/Benchmarks/MauiServiceProviderBenchmarker.cs
@@ -17,8 +17,8 @@ public class MauiServiceProviderBenchmarker
 		[IterationSetup(Target = nameof(DefaultBuilder))]
 		public void SetupForDefaultBuilder()
 		{
-			_host = AppHostBuilder
-				.CreateDefaultAppBuilder()
+			_host = AppHost
+				.CreateDefaultBuilder()
 				.ConfigureServices((ctx, svc) => svc.AddTransient<IFooService, FooService>())
 				.Build();
 		}
@@ -26,8 +26,8 @@ public void SetupForDefaultBuilder()
 		[IterationSetup(Target = nameof(DefaultBuilderWithConstructorInjection))]
 		public void SetupForDefaultBuilderWithConstructorInjection()
 		{
-			_host = AppHostBuilder
-				.CreateDefaultAppBuilder()
+			_host = AppHost
+				.CreateDefaultBuilder()
 				.UseMauiServiceProviderFactory(true)
 				.ConfigureServices((ctx, svc) => svc.AddTransient<IFooService, FooService>())
 				.Build();
@@ -36,8 +36,8 @@ public void SetupForDefaultBuilderWithConstructorInjection()
 		[IterationSetup(Target = nameof(OneConstructorParameter))]
 		public void SetupForOneConstructorParameter()
 		{
-			_host = AppHostBuilder
-				.CreateDefaultAppBuilder()
+			_host = AppHost
+				.CreateDefaultBuilder()
 				.UseMauiServiceProviderFactory(true)
 				.ConfigureServices((ctx, svc) =>
 				{
@@ -50,8 +50,8 @@ public void SetupForOneConstructorParameter()
 		[IterationSetup(Target = nameof(TwoConstructorParameters))]
 		public void SetupForTwoConstructorParameters()
 		{
-			_host = AppHostBuilder
-				.CreateDefaultAppBuilder()
+			_host = AppHost
+				.CreateDefaultBuilder()
 				.UseMauiServiceProviderFactory(true)
 				.ConfigureServices((ctx, svc) =>
 				{
@@ -65,8 +65,8 @@ public void SetupForTwoConstructorParameters()
 		[IterationSetup(Target = nameof(ExtensionsWithConstructorInjection))]
 		public void SetupForExtensionsWithConstructorInjection()
 		{
-			_host = AppHostBuilder
-				.CreateDefaultAppBuilder()
+			_host = AppHost
+				.CreateDefaultBuilder()
 				.UseServiceProviderFactory(new DIExtensionsServiceProviderFactory())
 				.ConfigureServices((ctx, svc) => svc.AddTransient<IFooService, FooService>())
 				.Build();
@@ -75,8 +75,8 @@ public void SetupForExtensionsWithConstructorInjection()
 		[IterationSetup(Target = nameof(ExtensionsWithOneConstructorParameter))]
 		public void SetupForExtensionsWithOneConstructorParameter()
 		{
-			_host = AppHostBuilder
-				.CreateDefaultAppBuilder()
+			_host = AppHost
+				.CreateDefaultBuilder()
 				.UseServiceProviderFactory(new DIExtensionsServiceProviderFactory())
 				.ConfigureServices((ctx, svc) =>
 				{
@@ -89,8 +89,8 @@ public void SetupForExtensionsWithOneConstructorParameter()
 		[IterationSetup(Target = nameof(ExtensionsWithTwoConstructorParameters))]
 		public void SetupForExtensionsWithTwoConstructorParameters()
 		{
-			_host = AppHostBuilder
-				.CreateDefaultAppBuilder()
+			_host = AppHost
+				.CreateDefaultBuilder()
 				.UseServiceProviderFactory(new DIExtensionsServiceProviderFactory())
 				.ConfigureServices((ctx, svc) =>
 				{
diff --git a/src/Core/tests/Benchmarks/Stubs/ApplicationStub.cs b/src/Core/tests/Benchmarks/Stubs/ApplicationStub.cs
index f11080bd337d..81afeb989a16 100644
--- a/src/Core/tests/Benchmarks/Stubs/ApplicationStub.cs
+++ b/src/Core/tests/Benchmarks/Stubs/ApplicationStub.cs
@@ -1,10 +1,17 @@
+using System.Collections.Generic;
+
 namespace Microsoft.Maui.Handlers.Benchmarks
 {
 	class ApplicationStub : IApplication
 	{
+		List<IWindow> _windows = new List<IWindow>();
+		public IReadOnlyList<IWindow> Windows => _windows.AsReadOnly();
+
 		public IWindow CreateWindow(IActivationState state)
 		{
-			return new WindowStub();
+			_windows.Add(new WindowStub());
+
+			return _windows[0];
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/tests/Benchmarks/Stubs/StubBase.cs b/src/Core/tests/Benchmarks/Stubs/StubBase.cs
new file mode 100644
index 000000000000..d1beccbe648c
--- /dev/null
+++ b/src/Core/tests/Benchmarks/Stubs/StubBase.cs
@@ -0,0 +1,81 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Primitives;
+
+namespace Microsoft.Maui.Handlers.Benchmarks
+{
+	public class StubBase : IFrameworkElement
+	{
+		public bool IsEnabled { get; set; } = true;
+
+		public Visibility Visibility { get; set; } = Visibility.Visible;
+
+		public double Opacity { get; set; } = 1.0d;
+
+		public Paint Background { get; set; }
+
+		public Rectangle Frame { get; set; } = new Rectangle(0, 0, 20, 20);
+
+		public IViewHandler Handler { get; set; }
+
+		public IFrameworkElement Parent { get; set; }
+
+		public Size DesiredSize { get; set; } = new Size(20, 20);
+
+		public bool IsMeasureValid { get; set; }
+
+		public bool IsArrangeValid { get; set; }
+
+		public double Width { get; set; }
+
+		public double Height { get; set; }
+
+		public Thickness Margin { get; set; }
+
+		public string AutomationId { get; set; }
+
+		public FlowDirection FlowDirection { get; set; }
+
+		public LayoutAlignment HorizontalLayoutAlignment { get; set; }
+
+		public LayoutAlignment VerticalLayoutAlignment { get; set; }
+
+		public Semantics Semantics { get; set; } = new Semantics();
+
+		public Size Arrange(Rectangle bounds)
+		{
+			Frame = bounds;
+			DesiredSize = bounds.Size;
+			return DesiredSize;
+		}
+
+		protected bool SetProperty<T>(ref T backingStore, T value,
+			[CallerMemberName] string propertyName = "",
+			Action<T, T> onChanged = null)
+		{
+			if (EqualityComparer<T>.Default.Equals(backingStore, value))
+				return false;
+
+			var oldValue = backingStore;
+			backingStore = value;
+			Handler?.UpdateValue(propertyName);
+			onChanged?.Invoke(oldValue, value);
+			return true;
+		}
+
+		public void InvalidateArrange()
+		{
+		}
+
+		public void InvalidateMeasure()
+		{
+		}
+
+		public Size Measure(double widthConstraint, double heightConstraint)
+		{
+			return new Size(widthConstraint, heightConstraint);
+		}
+	}
+}
diff --git a/src/Core/tests/Benchmarks/Stubs/WindowStub.cs b/src/Core/tests/Benchmarks/Stubs/WindowStub.cs
index b642f085b23d..c7436f4c8b2b 100644
--- a/src/Core/tests/Benchmarks/Stubs/WindowStub.cs
+++ b/src/Core/tests/Benchmarks/Stubs/WindowStub.cs
@@ -2,9 +2,8 @@
 
 namespace Microsoft.Maui.Handlers.Benchmarks
 {
-	public class WindowStub : IWindow
+	public class WindowStub : StubBase, IWindow
 	{
-		public IMauiContext MauiContext { get; set; }
-		public IPage Page { get; set; }
+		public IView View { get; set; }
 	}
 }
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Android/ColorComparison.cs b/src/Core/tests/DeviceTests/Android/ColorComparison.cs
new file mode 100644
index 000000000000..0ed946273314
--- /dev/null
+++ b/src/Core/tests/DeviceTests/Android/ColorComparison.cs
@@ -0,0 +1,19 @@
+using AColor = Android.Graphics.Color;
+
+namespace Microsoft.Maui.DeviceTests
+{
+	static class ColorComparison
+	{
+		public const int ColorPrecision = 1;
+
+		public static bool IsEquivalent(this AColor actualColor, AColor expectedColor, int precision = ColorPrecision)
+		{
+			var red = actualColor.R <= expectedColor.R + precision && actualColor.R >= expectedColor.R - precision;
+			var green = actualColor.G <= expectedColor.G + precision && actualColor.G >= expectedColor.G - precision;
+			var blue = actualColor.B <= expectedColor.B + precision && actualColor.B >= expectedColor.B - precision;
+			var alpha = actualColor.A <= expectedColor.A + precision && actualColor.A >= expectedColor.A - precision;
+
+			return red && green && blue && alpha;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/AssertionExtensions.Android.cs b/src/Core/tests/DeviceTests/AssertionExtensions.Android.cs
index 552ff4b841cb..328133f875b1 100644
--- a/src/Core/tests/DeviceTests/AssertionExtensions.Android.cs
+++ b/src/Core/tests/DeviceTests/AssertionExtensions.Android.cs
@@ -47,7 +47,14 @@ public static AColor ColorAtPoint(this Bitmap bitmap, int x, int y, bool include
 			}
 		}
 
-		public static async Task<Bitmap> ToBitmap(this AView view)
+		public static Task AttachAndRun(this AView view, Action action) =>
+			view.AttachAndRun(() =>
+			{
+				action();
+				return true;
+			});
+
+		public static async Task<T> AttachAndRun<T>(this AView view, Func<T> action)
 		{
 			var layout = new FrameLayout(view.Context);
 			layout.LayoutParameters = new FrameLayout.LayoutParams(500, 500);
@@ -67,20 +74,35 @@ public static async Task<Bitmap> ToBitmap(this AView view)
 
 			await Task.Delay(100);
 
-			var bitmap = Bitmap.CreateBitmap(view.Width, view.Height, Bitmap.Config.Argb8888);
-			using (var canvas = new Canvas(bitmap))
+			try
 			{
-				view.Draw(canvas);
+				var result = action();
+				return result;
+			}
+			finally
+			{
+				rootView.RemoveView(layout);
+				layout.RemoveView(view);
 			}
-
-			rootView.RemoveView(layout);
-
-			return bitmap;
 		}
 
+		public static Task<Bitmap> ToBitmap(this AView view) =>
+			view.AttachAndRun(() =>
+			{
+				var bitmap = Bitmap.CreateBitmap(view.Width, view.Height, Bitmap.Config.Argb8888);
+				using (var canvas = new Canvas(bitmap))
+				{
+					view.Draw(canvas);
+				}
+				return bitmap;
+			});
+
 		public static Bitmap AssertColorAtPoint(this Bitmap bitmap, AColor expectedColor, int x, int y)
 		{
-			Assert.Equal(bitmap.ColorAtPoint(x, y), expectedColor);
+			var actualColor = bitmap.ColorAtPoint(x, y);
+
+			if (!actualColor.IsEquivalent(expectedColor))
+				Assert.Equal(expectedColor, actualColor);
 
 			return bitmap;
 		}
@@ -110,18 +132,13 @@ public static Bitmap AssertColorAtTopRight(this Bitmap bitmap, AColor expectedCo
 			return bitmap.AssertColorAtPoint(expectedColor, bitmap.Width - 1, bitmap.Height - 1);
 		}
 
-		public static Task<Bitmap> AssertContainsColor(this AView view, Maui.Graphics.Color expectedColor) =>
-			AssertContainsColor(view, expectedColor.ToNative());
-
-		public static async Task<Bitmap> AssertContainsColor(this AView view, AColor expectedColor)
+		public static Bitmap AssertContainsColor(this Bitmap bitmap, AColor expectedColor)
 		{
-			var bitmap = await view.ToBitmap();
-
-			for (int x = 1; x < view.Width; x++)
+			for (int x = 0; x < bitmap.Width; x++)
 			{
-				for (int y = 1; y < view.Height; y++)
+				for (int y = 0; y < bitmap.Height; y++)
 				{
-					if (bitmap.ColorAtPoint(x, y, true) == expectedColor)
+					if (bitmap.ColorAtPoint(x, y, true).IsEquivalent(expectedColor))
 					{
 						return bitmap;
 					}
@@ -132,12 +149,19 @@ public static async Task<Bitmap> AssertContainsColor(this AView view, AColor exp
 			return bitmap;
 		}
 
-		public static async Task<Bitmap> AssertColorAtPoint(this AView view, AColor expectedColor, int x, int y)
+		public static Task<Bitmap> AssertContainsColor(this AView view, Maui.Graphics.Color expectedColor) =>
+			AssertContainsColor(view, expectedColor.ToNative());
+
+		public static async Task<Bitmap> AssertContainsColor(this AView view, AColor expectedColor)
 		{
 			var bitmap = await view.ToBitmap();
-			Assert.Equal(bitmap.ColorAtPoint(x, y), expectedColor);
+			return AssertContainsColor(bitmap, expectedColor);
+		}
 
-			return bitmap;
+		public static async Task<Bitmap> AssertColorAtPoint(this AView view, AColor expectedColor, int x, int y)
+		{
+			var bitmap = await view.ToBitmap();
+			return bitmap.AssertColorAtPoint(expectedColor, x, y);
 		}
 
 		public static async Task<Bitmap> AssertColorAtCenter(this AView view, AColor expectedColor)
@@ -181,5 +205,10 @@ public static TextUtils.TruncateAt ToNative(this LineBreakMode mode) =>
 				LineBreakMode.MiddleTruncation => TextUtils.TruncateAt.Middle,
 				_ => throw new ArgumentOutOfRangeException(nameof(mode))
 			};
+
+		public static FontWeight GetFontWeight(this Typeface typeface) =>
+			NativeVersion.IsAtLeast(28)
+				? (FontWeight)typeface.Weight
+				: typeface.IsBold ? FontWeight.Bold : FontWeight.Regular;
 	}
 }
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/AssertionExtensions.iOS.cs b/src/Core/tests/DeviceTests/AssertionExtensions.iOS.cs
index b1affd9003dc..41da7b02e3c7 100644
--- a/src/Core/tests/DeviceTests/AssertionExtensions.iOS.cs
+++ b/src/Core/tests/DeviceTests/AssertionExtensions.iOS.cs
@@ -1,8 +1,8 @@
 using System;
+using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using CoreGraphics;
 using Foundation;
-using Microsoft.Maui.Essentials;
 using UIKit;
 using Xunit;
 using Xunit.Sdk;
@@ -25,6 +25,13 @@ public static string CreateColorError(this UIImage bitmap, string message)
 			return $"{message}. This is what it looked like:<img>{imageAsString}</img>";
 		}
 
+		// TODO: attach this view to the UI if anything breaks
+		public static Task AttachAndRun(this UIView view, Action action)
+		{
+			action();
+			return Task.CompletedTask;
+		}
+
 		public static Task<UIImage> ToBitmap(this UIView view)
 		{
 			var imageRect = new CGRect(0, 0, view.Frame.Width, view.Frame.Height);
@@ -44,27 +51,39 @@ public static UIColor ColorAtPoint(this UIImage bitmap, int x, int y)
 		{
 			var pixel = bitmap.GetPixel(x, y);
 
-			// Returned pixel data is B, G, R, A (ARGB little endian byte order)
-			var color = new UIColor(pixel[2] / 255.0f, pixel[1] / 255.0f, pixel[0] / 255.0f, pixel[3] / 255.0f);
+			var color = new UIColor(
+				pixel[0] / 255.0f,
+				pixel[1] / 255.0f,
+				pixel[2] / 255.0f,
+				pixel[3] / 255.0f);
 
 			return color;
 		}
 
 		public static byte[] GetPixel(this UIImage bitmap, int x, int y)
 		{
-			var cgImage = bitmap.CGImage.WithColorSpace(CGColorSpace.CreateDeviceRGB());
+			var cgImage = bitmap.CGImage;
+			var width = cgImage.Width;
+			var height = cgImage.Height;
+			var colorSpace = CGColorSpace.CreateDeviceRGB();
+			var bitsPerComponent = 8;
+			var bytesPerRow = 4 * width;
+			var componentCount = 4;
+
+			var dataBytes = new byte[width * height * componentCount];
 
-			// Grab the raw image data
-			var nsData = cgImage.DataProvider.CopyData();
+			using var context = new CGBitmapContext(
+				dataBytes,
+				width, height,
+				bitsPerComponent, bytesPerRow,
+				colorSpace,
+				CGBitmapFlags.ByteOrder32Big | CGBitmapFlags.PremultipliedLast);
 
-			// Copy the data into a buffer
-			var dataBytes = new byte[nsData.Length];
-			System.Runtime.InteropServices.Marshal.Copy(nsData.Bytes, dataBytes, 0, (int)nsData.Length);
+			context.DrawImage(new CGRect(0, 0, width, height), cgImage);
 
-			// Figure out where the pixel we care about is
-			var pixelLocation = (cgImage.BytesPerRow * y) + (4 * x);
+			var pixelLocation = (bytesPerRow * y) + componentCount * x;
 
-			var pixel = new byte[4]
+			var pixel = new byte[]
 			{
 				dataBytes[pixelLocation],
 				dataBytes[pixelLocation + 1],
@@ -77,25 +96,12 @@ public static byte[] GetPixel(this UIImage bitmap, int x, int y)
 
 		public static UIImage AssertColorAtPoint(this UIImage bitmap, UIColor expectedColor, int x, int y)
 		{
-			try
-			{
-				var cap = bitmap.ColorAtPoint(x, y);
-
-				if (!ColorComparison.ARGBEquivalent(cap, expectedColor))
-				{
-					System.Diagnostics.Debug.WriteLine("Here");
-				}
+			var cap = bitmap.ColorAtPoint(x, y);
 
+			if (!ColorComparison.ARGBEquivalent(cap, expectedColor))
 				Assert.Equal(cap, expectedColor, new ColorComparison());
 
-				return bitmap;
-			}
-			catch (Exception ex)
-			{
-				System.Diagnostics.Debug.WriteLine(ex);
-			}
-
-			return null;
+			return bitmap;
 		}
 
 		public static UIImage AssertColorAtCenter(this UIImage bitmap, UIColor expectedColor)
diff --git a/src/Core/tests/DeviceTests/Core.DeviceTests.csproj b/src/Core/tests/DeviceTests/Core.DeviceTests.csproj
index da130806fe3f..03fa47bf1c97 100644
--- a/src/Core/tests/DeviceTests/Core.DeviceTests.csproj
+++ b/src/Core/tests/DeviceTests/Core.DeviceTests.csproj
@@ -17,6 +17,8 @@
   </ItemGroup>
   <ItemGroup>
     <MauiFont Include="Fonts\*" />
+    <MauiImage Include="Images\*" />
+    <MauiImage Update="Images\*.gif" Resize="false" />
   </ItemGroup>
   <Import Project="..\..\..\..\.nuspec\Microsoft.Maui.Resizetizer.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Fonts/LobsterTwo-Bold.ttf b/src/Core/tests/DeviceTests/Fonts/LobsterTwo-Bold.ttf
new file mode 100644
index 000000000000..2e979fbff2ca
Binary files /dev/null and b/src/Core/tests/DeviceTests/Fonts/LobsterTwo-Bold.ttf differ
diff --git a/src/Core/tests/DeviceTests/Fonts/LobsterTwo-BoldItalic.ttf b/src/Core/tests/DeviceTests/Fonts/LobsterTwo-BoldItalic.ttf
new file mode 100644
index 000000000000..8bbf8d827893
Binary files /dev/null and b/src/Core/tests/DeviceTests/Fonts/LobsterTwo-BoldItalic.ttf differ
diff --git a/src/Core/tests/DeviceTests/Fonts/LobsterTwo-Italic.ttf b/src/Core/tests/DeviceTests/Fonts/LobsterTwo-Italic.ttf
new file mode 100644
index 000000000000..b88ec1723c6c
Binary files /dev/null and b/src/Core/tests/DeviceTests/Fonts/LobsterTwo-Italic.ttf differ
diff --git a/src/Core/tests/DeviceTests/Fonts/LobsterTwo-Regular.ttf b/src/Core/tests/DeviceTests/Fonts/LobsterTwo-Regular.ttf
new file mode 100644
index 000000000000..556c45e7d1d6
Binary files /dev/null and b/src/Core/tests/DeviceTests/Fonts/LobsterTwo-Regular.ttf differ
diff --git a/src/Core/tests/DeviceTests/Handlers/ActivityIndicator/ActivityIndicatorHandlerTests.Android.cs b/src/Core/tests/DeviceTests/Handlers/ActivityIndicator/ActivityIndicatorHandlerTests.Android.cs
index 26e6427c44de..655753d930dd 100644
--- a/src/Core/tests/DeviceTests/Handlers/ActivityIndicator/ActivityIndicatorHandlerTests.Android.cs
+++ b/src/Core/tests/DeviceTests/Handlers/ActivityIndicator/ActivityIndicatorHandlerTests.Android.cs
@@ -2,22 +2,21 @@
 using System.Threading.Tasks;
 using Android.Views;
 using Android.Widget;
+using Microsoft.Maui.DeviceTests.Stubs;
 using Microsoft.Maui.Graphics;
 using Microsoft.Maui.Handlers;
+using Xunit;
 
 namespace Microsoft.Maui.DeviceTests
 {
 	public partial class ActivityIndicatorHandlerTests
 	{
 		ProgressBar GetNativeActivityIndicator(ActivityIndicatorHandler activityIndicatorHandler) =>
-			(ProgressBar)activityIndicatorHandler.NativeView;
+			activityIndicatorHandler.NativeView;
 
 		bool GetNativeIsRunning(ActivityIndicatorHandler activityIndicatorHandler) =>
 			GetNativeActivityIndicator(activityIndicatorHandler).Visibility == ViewStates.Visible;
 
-		Task ValidateColor(IActivityIndicator activityIndicator, Color color, Action action = null) =>
-			ValidateHasColor(activityIndicator, color, action);
-
 		Task ValidateHasColor(IActivityIndicator activityIndicator, Color color, Action action = null)
 		{
 			return InvokeOnMainThreadAsync(() =>
@@ -27,5 +26,20 @@ Task ValidateHasColor(IActivityIndicator activityIndicator, Color color, Action
 				nativeActivityIndicator.AssertContainsColor(color);
 			});
 		}
+
+		[Theory(DisplayName = "Visibility is set correctly")]
+		[InlineData(Visibility.Collapsed)]
+		[InlineData(Visibility.Hidden)]
+		public override async Task SetVisibility(Visibility visibility)
+		{
+			var view = new ActivityIndicatorStub
+			{
+				Visibility = visibility,
+				IsRunning = true
+			};
+
+			var id = await GetValueAsync(view, handler => GetVisibility(handler));
+			Assert.Equal(view.Visibility, id);
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Handlers/ActivityIndicator/ActivityIndicatorHandlerTests.cs b/src/Core/tests/DeviceTests/Handlers/ActivityIndicator/ActivityIndicatorHandlerTests.cs
index fac52adfcacf..dbda9755d9a8 100644
--- a/src/Core/tests/DeviceTests/Handlers/ActivityIndicator/ActivityIndicatorHandlerTests.cs
+++ b/src/Core/tests/DeviceTests/Handlers/ActivityIndicator/ActivityIndicatorHandlerTests.cs
@@ -22,16 +22,15 @@ public async Task IsRunningInitializesCorrectly(bool isRunning)
 			await ValidatePropertyInitValue(activityIndicator, () => activityIndicator.IsRunning, GetNativeIsRunning, activityIndicator.IsRunning);
 		}
 
-		[Fact(DisplayName = "BackgroundColor Updates Correctly")]
-		public async Task BackgroundColorUpdatesCorrectly()
+		[Fact(DisplayName = "Background Updates Correctly")]
+		public async Task BackgroundUpdatesCorrectly()
 		{
 			var activityIndicator = new ActivityIndicatorStub()
 			{
-				BackgroundColor = Colors.Yellow,
 				IsRunning = true
 			};
 
-			await ValidateColor(activityIndicator, Colors.Yellow, () => activityIndicator.BackgroundColor = Colors.Yellow);
+			await ValidateHasColor(activityIndicator, Colors.Yellow, () => activityIndicator.Background = new SolidPaintStub(Colors.Yellow));
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Handlers/ActivityIndicator/ActivityIndicatorHandlerTests.iOS.cs b/src/Core/tests/DeviceTests/Handlers/ActivityIndicator/ActivityIndicatorHandlerTests.iOS.cs
index e093deb77b5f..353b1234c422 100644
--- a/src/Core/tests/DeviceTests/Handlers/ActivityIndicator/ActivityIndicatorHandlerTests.iOS.cs
+++ b/src/Core/tests/DeviceTests/Handlers/ActivityIndicator/ActivityIndicatorHandlerTests.iOS.cs
@@ -3,27 +3,25 @@
 using Microsoft.Maui.Graphics;
 using Microsoft.Maui.Handlers;
 using UIKit;
-using Xunit;
 
 namespace Microsoft.Maui.DeviceTests
 {
 	public partial class ActivityIndicatorHandlerTests
 	{
 		UIActivityIndicatorView GetNativeActivityIndicator(ActivityIndicatorHandler activityIndicatorHandler) =>
-			(UIActivityIndicatorView)activityIndicatorHandler.NativeView;
+			activityIndicatorHandler.NativeView;
 
 		bool GetNativeIsRunning(ActivityIndicatorHandler activityIndicatorHandler) =>
 			GetNativeActivityIndicator(activityIndicatorHandler).IsAnimating;
 
-		async Task ValidateColor(IActivityIndicator activityIndicator, Color color, Action action = null)
+		Task ValidateHasColor(IActivityIndicator activityIndicator, Color color, Action action = null)
 		{
-			var expected = await GetValueAsync(activityIndicator, handler =>
+			return InvokeOnMainThreadAsync(() =>
 			{
-				var native = GetNativeActivityIndicator(handler);
+				var nativeActivityIndicator = GetNativeActivityIndicator(CreateHandler(activityIndicator));
 				action?.Invoke();
-				return native.BackgroundColor.ToColor();
+				nativeActivityIndicator.AssertContainsColor(color);
 			});
-			Assert.Equal(expected, color);
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Handlers/Button/ButtonHandlerTests.Android.cs b/src/Core/tests/DeviceTests/Handlers/Button/ButtonHandlerTests.Android.cs
index a8a603c6a0f6..1b443eb82e57 100644
--- a/src/Core/tests/DeviceTests/Handlers/Button/ButtonHandlerTests.Android.cs
+++ b/src/Core/tests/DeviceTests/Handlers/Button/ButtonHandlerTests.Android.cs
@@ -134,7 +134,7 @@ double GetNativeUnscaledFontSize(ButtonHandler buttonHandler)
 		}
 
 		bool GetNativeIsBold(ButtonHandler buttonHandler) =>
-			GetNativeButton(buttonHandler).Typeface.IsBold;
+			GetNativeButton(buttonHandler).Typeface.GetFontWeight() == FontWeight.Bold;
 
 		bool GetNativeIsItalic(ButtonHandler buttonHandler) =>
 			GetNativeButton(buttonHandler).Typeface.IsItalic;
diff --git a/src/Core/tests/DeviceTests/Handlers/Button/ButtonHandlerTests.cs b/src/Core/tests/DeviceTests/Handlers/Button/ButtonHandlerTests.cs
index 2b45fb817913..23a0c617b20e 100644
--- a/src/Core/tests/DeviceTests/Handlers/Button/ButtonHandlerTests.cs
+++ b/src/Core/tests/DeviceTests/Handlers/Button/ButtonHandlerTests.cs
@@ -66,20 +66,20 @@ public async Task FontSizeInitializesCorrectly(int fontSize)
 		}
 
 		[Theory(DisplayName = "Font Attributes Initialize Correctly")]
-		[InlineData(FontAttributes.None, false, false)]
-		[InlineData(FontAttributes.Bold, true, false)]
-		[InlineData(FontAttributes.Italic, false, true)]
-		[InlineData(FontAttributes.Bold | FontAttributes.Italic, true, true)]
-		public async Task FontAttributesInitializeCorrectly(FontAttributes attributes, bool isBold, bool isItalic)
+		[InlineData(FontWeight.Regular, false, false)]
+		[InlineData(FontWeight.Bold, true, false)]
+		[InlineData(FontWeight.Regular, false, true)]
+		[InlineData(FontWeight.Bold, true, true)]
+		public async Task FontAttributesInitializeCorrectly(FontWeight weight, bool isBold, bool isItalic)
 		{
 			var button = new ButtonStub()
 			{
 				Text = "Test",
-				Font = Font.OfSize("Arial", 10).WithAttributes(attributes)
+				Font = Font.OfSize("Arial", 10, weight, isItalic ? FontSlant.Italic : FontSlant.Default)
 			};
 
-			await ValidatePropertyInitValue(button, () => button.Font.FontAttributes.HasFlag(FontAttributes.Bold), GetNativeIsBold, isBold);
-			await ValidatePropertyInitValue(button, () => button.Font.FontAttributes.HasFlag(FontAttributes.Italic), GetNativeIsItalic, isItalic);
+			await ValidatePropertyInitValue(button, () => button.Font.Weight == FontWeight.Bold, GetNativeIsBold, isBold);
+			await ValidatePropertyInitValue(button, () => button.Font.FontSlant == FontSlant.Italic, GetNativeIsItalic, isItalic);
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.Android.cs b/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.Android.cs
index 3c17226a5174..771ad04079fd 100644
--- a/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.Android.cs
+++ b/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.Android.cs
@@ -184,7 +184,7 @@ double GetNativeUnscaledFontSize(EntryHandler entryHandler)
 		}
 
 		bool GetNativeIsBold(EntryHandler entryHandler) =>
-			GetNativeEntry(entryHandler).Typeface.IsBold;
+			GetNativeEntry(entryHandler).Typeface.GetFontWeight() == FontWeight.Bold;
 
 		bool GetNativeIsItalic(EntryHandler entryHandler) =>
 			GetNativeEntry(entryHandler).Typeface.IsItalic;
diff --git a/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.cs b/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.cs
index d3bd2dc28a22..de02becdf941 100644
--- a/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.cs
+++ b/src/Core/tests/DeviceTests/Handlers/Entry/EntryHandlerTests.cs
@@ -178,20 +178,20 @@ public async Task FontSizeInitializesCorrectly(int fontSize)
 		}
 
 		[Theory(DisplayName = "Font Attributes Initialize Correctly")]
-		[InlineData(FontAttributes.None, false, false)]
-		[InlineData(FontAttributes.Bold, true, false)]
-		[InlineData(FontAttributes.Italic, false, true)]
-		[InlineData(FontAttributes.Bold | FontAttributes.Italic, true, true)]
-		public async Task FontAttributesInitializeCorrectly(FontAttributes attributes, bool isBold, bool isItalic)
+		[InlineData(FontWeight.Regular, false, false)]
+		[InlineData(FontWeight.Bold, true, false)]
+		[InlineData(FontWeight.Regular, false, true)]
+		[InlineData(FontWeight.Bold, true, true)]
+		public async Task FontAttributesInitializeCorrectly(FontWeight weight, bool isBold, bool isItalic)
 		{
 			var entry = new EntryStub()
 			{
 				Text = "Test",
-				Font = Font.OfSize("Arial", 10).WithAttributes(attributes)
+				Font = Font.OfSize("Arial", 10, weight, isItalic ? FontSlant.Italic : FontSlant.Default)
 			};
 
-			await ValidatePropertyInitValue(entry, () => entry.Font.FontAttributes.HasFlag(FontAttributes.Bold), GetNativeIsBold, isBold);
-			await ValidatePropertyInitValue(entry, () => entry.Font.FontAttributes.HasFlag(FontAttributes.Italic), GetNativeIsItalic, isItalic);
+			await ValidatePropertyInitValue(entry, () => entry.Font.Weight == FontWeight.Bold, GetNativeIsBold, isBold);
+			await ValidatePropertyInitValue(entry, () => entry.Font.FontSlant == FontSlant.Italic, GetNativeIsItalic, isItalic);
 		}
 
 		[Theory(DisplayName = "Validates clear button visibility.")]
diff --git a/src/Core/tests/DeviceTests/Handlers/HandlerTestBase.Android.cs b/src/Core/tests/DeviceTests/Handlers/HandlerTestBase.Android.cs
index 9865396c1ffd..9a044e5a1923 100644
--- a/src/Core/tests/DeviceTests/Handlers/HandlerTestBase.Android.cs
+++ b/src/Core/tests/DeviceTests/Handlers/HandlerTestBase.Android.cs
@@ -1,24 +1,9 @@
-using System;
 using Android.Views;
-using Android.Widget;
-using AndroidX.Core.View;
-using AndroidX.Core.View.Accessibility;
 
 namespace Microsoft.Maui.DeviceTests
 {
 	public partial class HandlerTestBase<THandler, TStub>
 	{
-		protected THandler CreateHandler(IView view)
-		{
-			var handler = Activator.CreateInstance<THandler>();
-			handler.SetMauiContext(MauiContext);
-
-			handler.SetVirtualView(view);
-			view.Handler = handler;
-
-			return handler;
-		}
-
 		protected string GetAutomationId(IViewHandler viewHandler) =>
 			$"{((View)viewHandler.NativeView).GetTag(ViewExtensions.AutomationTagId)}";
 
@@ -36,5 +21,17 @@ protected SemanticHeadingLevel GetSemanticHeading(IViewHandler viewHandler)
 
 			return viewHandler.VirtualView.Semantics.HeadingLevel;
 		}
+
+		protected Visibility GetVisibility(IViewHandler viewHandler)
+		{
+			var nativeView = (View)viewHandler.NativeView;
+
+			if (nativeView.Visibility == ViewStates.Visible)
+				return Visibility.Visible;
+			else if (nativeView.Visibility == ViewStates.Gone)
+				return Visibility.Collapsed;
+			else
+				return Visibility.Hidden;
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Handlers/HandlerTestBase.Tests.cs b/src/Core/tests/DeviceTests/Handlers/HandlerTestBase.Tests.cs
index 8e3017932f4b..a3a5412d0f21 100644
--- a/src/Core/tests/DeviceTests/Handlers/HandlerTestBase.Tests.cs
+++ b/src/Core/tests/DeviceTests/Handlers/HandlerTestBase.Tests.cs
@@ -1,6 +1,4 @@
-using System;
 using System.Threading.Tasks;
-using Microsoft.Maui.DeviceTests.Stubs;
 using Xunit;
 
 namespace Microsoft.Maui.DeviceTests
@@ -11,19 +9,35 @@ public abstract partial class HandlerTestBase<THandler, TStub>
 		[InlineData()]
 		public async Task SetAutomationId()
 		{
-			var view = new TStub();
-			view.AutomationId = "TestId";
-			var id = await GetValueAsync((IView)view, handler => GetAutomationId(handler));
+			var view = new TStub
+			{
+				AutomationId = "TestId"
+			};
+			var id = await GetValueAsync(view, handler => GetAutomationId(handler));
 			Assert.Equal(view.AutomationId, id);
 		}
 
+		[Theory(DisplayName = "Visibility is set correctly")]
+		[InlineData(Visibility.Collapsed)]
+		[InlineData(Visibility.Hidden)]
+		public virtual async Task SetVisibility(Visibility visibility)
+		{
+			var view = new TStub
+			{
+				Visibility = visibility
+			};
+
+			var id = await GetValueAsync(view, handler => GetVisibility(handler));
+			Assert.Equal(view.Visibility, id);
+		}
+
 		[Fact(DisplayName = "Semantic Description is set correctly")]
 		[InlineData()]
 		public async Task SetSemanticDescription()
 		{
 			var view = new TStub();
 			view.Semantics.Description = "Test";
-			var id = await GetValueAsync((IView)view, handler => GetSemanticDescription(handler));
+			var id = await GetValueAsync(view, handler => GetSemanticDescription(handler));
 			Assert.Equal(view.Semantics.Description, id);
 		}
 
@@ -37,7 +51,7 @@ public async Task SetSemanticHint()
 		{
 			var view = new TStub();
 			view.Semantics.Description = "Test";
-			var id = await GetValueAsync((IView)view, handler => GetSemanticDescription(handler));
+			var id = await GetValueAsync(view, handler => GetSemanticDescription(handler));
 			Assert.Equal(view.Semantics.Description, id);
 		}
 
@@ -47,7 +61,7 @@ public async Task SetSemanticHeading()
 		{
 			var view = new TStub();
 			view.Semantics.HeadingLevel = SemanticHeadingLevel.Level1;
-			var id = await GetValueAsync((IView)view, handler => GetSemanticHeading(handler));
+			var id = await GetValueAsync(view, handler => GetSemanticHeading(handler));
 			Assert.Equal(view.Semantics.HeadingLevel, id);
 		}
 
@@ -55,10 +69,12 @@ public async Task SetSemanticHeading()
 		[InlineData()]
 		public async Task NullSemanticsClass()
 		{
-			var view = new TStub();
-			view.Semantics = null;
-			view.AutomationId = "CreationFailed";
-			var id = await GetValueAsync((IView)view, handler => GetAutomationId(handler));
+			var view = new TStub
+			{
+				Semantics = null,
+				AutomationId = "CreationFailed"
+			};
+			var id = await GetValueAsync(view, handler => GetAutomationId(handler));
 			Assert.Equal(view.AutomationId, id);
 		}
 	}
diff --git a/src/Core/tests/DeviceTests/Handlers/HandlerTestBase.cs b/src/Core/tests/DeviceTests/Handlers/HandlerTestBase.cs
index 6fefe35c1e1b..480689f549a7 100644
--- a/src/Core/tests/DeviceTests/Handlers/HandlerTestBase.cs
+++ b/src/Core/tests/DeviceTests/Handlers/HandlerTestBase.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Threading.Tasks;
 using Microsoft.Maui.DeviceTests.Stubs;
-using Microsoft.Maui.Essentials;
 using Microsoft.Maui.Hosting;
 using Xunit;
 
@@ -17,11 +16,19 @@ public partial class HandlerTestBase<THandler, TStub> : TestBase, IDisposable
 
 		public HandlerTestBase()
 		{
-			var appBuilder = AppHostBuilder
-				.CreateDefaultAppBuilder()
+			var appBuilder = AppHost
+				.CreateDefaultBuilder()
+				.ConfigureImageSources((ctx, services) =>
+				{
+					services.AddService<ICountedImageSourceStub, CountedImageSourceServiceStub>();
+				})
 				.ConfigureFonts((ctx, fonts) =>
 				{
 					fonts.AddFont("dokdo_regular.ttf", "Dokdo");
+					fonts.AddFont("LobsterTwo-Regular.ttf", "Lobster Two");
+					fonts.AddFont("LobsterTwo-Bold.ttf", "Lobster Two Bold");
+					fonts.AddFont("LobsterTwo-Italic.ttf", "Lobster Two Italic");
+					fonts.AddFont("LobsterTwo-BoldItalic.ttf", "Lobster Two BoldItalic");
 				});
 
 			_host = appBuilder.Build();
@@ -43,17 +50,20 @@ public void Dispose()
 
 		public IMauiContext MauiContext => _context;
 
-		public Task<T> InvokeOnMainThreadAsync<T>(Func<T> func) =>
-			MainThread.InvokeOnMainThreadAsync(func);
+		protected THandler CreateHandler(IView view) =>
+			CreateHandler<THandler>(view);
 
-		protected Task InvokeOnMainThreadAsync(Action action) =>
-			MainThread.InvokeOnMainThreadAsync(action);
+		protected TCustomHandler CreateHandler<TCustomHandler>(IView view)
+			where TCustomHandler : THandler
+		{
+			var handler = Activator.CreateInstance<TCustomHandler>();
+			handler.SetMauiContext(MauiContext);
 
-		protected Task InvokeOnMainThreadAsync(Func<Task> func) =>
-			MainThread.InvokeOnMainThreadAsync(func);
+			handler.SetVirtualView(view);
+			view.Handler = handler;
 
-		public Task<T> InvokeOnMainThreadAsync<T>(Func<Task<T>> func) =>
-			MainThread.InvokeOnMainThreadAsync(func);
+			return handler;
+		}
 
 		protected async Task<THandler> CreateHandlerAsync(IView view)
 		{
diff --git a/src/Core/tests/DeviceTests/Handlers/HandlerTestBase.iOS.cs b/src/Core/tests/DeviceTests/Handlers/HandlerTestBase.iOS.cs
index 66d00f21db43..4c87123973f2 100644
--- a/src/Core/tests/DeviceTests/Handlers/HandlerTestBase.iOS.cs
+++ b/src/Core/tests/DeviceTests/Handlers/HandlerTestBase.iOS.cs
@@ -1,24 +1,9 @@
-using System;
-using System.Threading.Tasks;
-using Microsoft.Maui.DeviceTests.Stubs;
 using UIKit;
-using Xunit;
 
 namespace Microsoft.Maui.DeviceTests
 {
 	public partial class HandlerTestBase<THandler, TStub>
 	{
-		protected THandler CreateHandler(IView view)
-		{
-			var handler = Activator.CreateInstance<THandler>();
-			handler.SetMauiContext(MauiContext);
-
-			handler.SetVirtualView(view);
-			view.Handler = handler;
-
-			return handler;
-		}
-
 		protected string GetAutomationId(IViewHandler viewHandler) =>
 			((UIView)viewHandler.NativeView).AccessibilityIdentifier;
 
@@ -31,5 +16,29 @@ protected string GetSemanticHint(IViewHandler viewHandler) =>
 		protected SemanticHeadingLevel GetSemanticHeading(IViewHandler viewHandler) =>
 			((UIView)viewHandler.NativeView).AccessibilityTraits.HasFlag(UIAccessibilityTrait.Header)
 				? SemanticHeadingLevel.Level1 : SemanticHeadingLevel.None;
+
+		protected Visibility GetVisibility(IViewHandler viewHandler)
+		{
+			var nativeView = (UIView)viewHandler.NativeView;
+
+			foreach (var constraint in nativeView.Constraints)
+			{
+				if (constraint is CollapseConstraint collapseConstraint)
+				{
+					// Active the collapse constraint; that will squish the view down to zero height
+					if (collapseConstraint.Active)
+					{
+						return Visibility.Collapsed;
+					}
+				}
+			}
+
+			if (nativeView.Hidden)
+			{
+				return Visibility.Hidden;
+			}
+
+			return Visibility.Visible;
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Handlers/Image/ImageHandlerTests.Android.cs b/src/Core/tests/DeviceTests/Handlers/Image/ImageHandlerTests.Android.cs
new file mode 100644
index 000000000000..d24b1779b388
--- /dev/null
+++ b/src/Core/tests/DeviceTests/Handlers/Image/ImageHandlerTests.Android.cs
@@ -0,0 +1,149 @@
+using System;
+using System.Threading.Tasks;
+using Android.Graphics.Drawables;
+using Android.Widget;
+using Microsoft.Maui.DeviceTests.Stubs;
+using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Handlers;
+using Xunit;
+
+namespace Microsoft.Maui.DeviceTests
+{
+	public partial class ImageHandlerTests
+	{
+		[Theory]
+		[InlineData("#FF0000")]
+		[InlineData("#00FF00")]
+		[InlineData("#000000")]
+		public async Task InitializingNullSourceOnlyUpdatesTransparent(string colorHex)
+		{
+			var expectedColor = Color.FromHex(colorHex);
+
+			var image = new ImageStub
+			{
+				Background = new SolidPaintStub(expectedColor)
+			};
+
+			await InvokeOnMainThreadAsync(async () =>
+			{
+				var handler = CreateHandler<CountedImageHandler>(image);
+
+				await image.Wait();
+
+				Assert.Single(handler.ImageEvents);
+				Assert.Equal("SetImageResource", handler.ImageEvents[0].Member);
+				Assert.Equal(Android.Resource.Color.Transparent, handler.ImageEvents[0].Value);
+
+				await handler.NativeView.AssertContainsColor(expectedColor);
+			});
+		}
+
+		[Fact]
+		public async Task InitializingSourceOnlyUpdatesDrawableOnce()
+		{
+			var image = new ImageStub
+			{
+				Background = new SolidPaintStub(Colors.Black),
+				Source = new FileImageSourceStub("red.png"),
+			};
+
+			await InvokeOnMainThreadAsync(async () =>
+			{
+				var handler = CreateHandler<CountedImageHandler>(image);
+
+				await image.Wait();
+
+				await handler.NativeView.AssertContainsColor(Colors.Red);
+
+				Assert.Equal(2, handler.ImageEvents.Count);
+				Assert.Equal("SetImageResource", handler.ImageEvents[0].Member);
+				Assert.Equal(Android.Resource.Color.Transparent, handler.ImageEvents[0].Value);
+				Assert.Equal("SetImageDrawable", handler.ImageEvents[1].Member);
+				Assert.IsType<BitmapDrawable>(handler.ImageEvents[1].Value);
+			});
+		}
+
+		[Fact]
+		public async Task UpdatingSourceOnlyUpdatesDrawableTwice()
+		{
+			var image = new ImageStub
+			{
+				Background = new SolidPaintStub(Colors.Black),
+				Source = new FileImageSourceStub("red.png"),
+			};
+
+			await InvokeOnMainThreadAsync(async () =>
+			{
+				var handler = CreateHandler<CountedImageHandler>(image);
+
+				await image.Wait();
+
+				await handler.NativeView.AssertContainsColor(Colors.Red);
+
+				handler.ImageEvents.Clear();
+
+				image.Source = new FileImageSourceStub("blue.png");
+				handler.UpdateValue(nameof(IImage.Source));
+
+				await image.Wait();
+
+				await handler.NativeView.AssertContainsColor(Colors.Blue);
+
+				Assert.Equal(2, handler.ImageEvents.Count);
+				Assert.Equal("SetImageResource", handler.ImageEvents[0].Member);
+				Assert.Equal(Android.Resource.Color.Transparent, handler.ImageEvents[0].Value);
+				Assert.Equal("SetImageDrawable", handler.ImageEvents[1].Member);
+				Assert.IsType<BitmapDrawable>(handler.ImageEvents[1].Value);
+			});
+		}
+
+		[Fact]
+		public async Task ImageLoadSequenceIsCorrectWithChecks()
+		{
+			var events = await ImageLoadSequenceIsCorrect();
+
+			Assert.Equal(2, events.Count);
+			Assert.Equal("SetImageResource", events[0].Member);
+			Assert.Equal(Android.Resource.Color.Transparent, events[0].Value);
+			Assert.Equal("SetImageDrawable", events[1].Member);
+			var drawable = Assert.IsType<ColorDrawable>(events[1].Value);
+			drawable.Color.IsEquivalent(Colors.Blue.ToNative());
+		}
+
+		[Fact]
+		public async Task InterruptingLoadCancelsAndStartsOverWithChecks()
+		{
+			var events = await InterruptingLoadCancelsAndStartsOver();
+
+			Assert.Equal(3, events.Count);
+			Assert.Equal("SetImageResource", events[0].Member);
+			Assert.Equal(Android.Resource.Color.Transparent, events[0].Value);
+			Assert.Equal("SetImageResource", events[1].Member);
+			Assert.Equal(Android.Resource.Color.Transparent, events[1].Value);
+			Assert.Equal("SetImageDrawable", events[2].Member);
+			var drawable = Assert.IsType<ColorDrawable>(events[2].Value);
+			drawable.Color.IsEquivalent(Colors.Red.ToNative());
+		}
+
+		ImageView GetNativeImageView(ImageHandler imageHandler) =>
+			imageHandler.NativeView;
+
+		bool GetNativeIsAnimationPlaying(ImageHandler imageHandler) =>
+			GetNativeImageView(imageHandler).Drawable is IAnimatable animatable && animatable.IsRunning;
+
+		Aspect GetNativeAspect(ImageHandler imageHandler)
+		{
+			var scaleType = GetNativeImageView(imageHandler).GetScaleType();
+			if (scaleType == ImageView.ScaleType.Center)
+				return Aspect.Center;
+			if (scaleType == ImageView.ScaleType.CenterCrop)
+				return Aspect.AspectFill;
+			if (scaleType == ImageView.ScaleType.FitCenter)
+				return Aspect.AspectFit;
+			if (scaleType == ImageView.ScaleType.FitXy)
+				return Aspect.Fill;
+
+			throw new ArgumentOutOfRangeException("Aspect");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Handlers/Image/ImageHandlerTests.cs b/src/Core/tests/DeviceTests/Handlers/Image/ImageHandlerTests.cs
new file mode 100644
index 000000000000..8f2147e26ede
--- /dev/null
+++ b/src/Core/tests/DeviceTests/Handlers/Image/ImageHandlerTests.cs
@@ -0,0 +1,257 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Maui.DeviceTests.Stubs;
+using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Handlers;
+using Xunit;
+
+namespace Microsoft.Maui.DeviceTests
+{
+	[Category(TestCategory.Image)]
+	public partial class ImageHandlerTests : HandlerTestBase<ImageHandler, ImageStub>
+	{
+		[Theory(
+#if _ANDROID__
+			Skip = "Test failing on ANDROID"
+#endif
+			)]
+		[InlineData("red.png", "#FF0000")]
+		[InlineData("green.png", "#00FF00")]
+		[InlineData("black.png", "#000000")]
+		public async Task SourceInitializesCorrectly(string filename, string colorHex)
+		{
+			var image = new ImageStub
+			{
+				Background = new SolidPaintStub(Colors.Black),
+				Source = new FileImageSourceStub(filename),
+			};
+
+			var order = new List<string>();
+
+			image.LoadingStarted += () => order.Add($"LoadingStarted");
+			image.LoadingCompleted += successful => order.Add($"LoadingCompleted({successful})");
+			image.LoadingFailed += exception => order.Add($"LoadingFailed({exception})");
+
+			await InvokeOnMainThreadAsync(async () =>
+			{
+				var handler = CreateHandler(image);
+
+				await image.Wait();
+
+				var expectedColor = Color.FromHex(colorHex);
+
+				await handler.NativeView.AssertContainsColor(expectedColor);
+			});
+
+			Assert.Equal(new[] { "LoadingStarted", "LoadingCompleted(True)" }, order);
+		}
+
+		[Theory(
+#if __IOS__ || __ANDROID__
+			Skip = "Animated GIFs are not yet supported on iOS. Test failing on ANDROID"
+#endif
+		)]
+		[InlineData("animated_heart.gif", true)]
+		[InlineData("animated_heart.gif", false)]
+		public async Task AnimatedSourceInitializesCorrectly(string filename, bool isAnimating)
+		{
+			var image = new ImageStub
+			{
+				Source = new FileImageSourceStub(filename),
+				IsAnimationPlaying = isAnimating,
+			};
+
+			await InvokeOnMainThreadAsync(async () =>
+			{
+				var handler = CreateHandler(image);
+
+				await image.Wait();
+
+				await GetNativeImageView(handler).AttachAndRun(() =>
+				{
+					Assert.Equal(isAnimating, GetNativeIsAnimationPlaying(handler));
+				});
+			});
+		}
+
+		[Theory]
+		[InlineData(Aspect.AspectFill)]
+		[InlineData(Aspect.AspectFit)]
+		[InlineData(Aspect.Center)]
+		[InlineData(Aspect.Fill)]
+		public async Task AspectInitializesCorrectly(Aspect aspect)
+		{
+			var image = new ImageStub()
+			{
+				Aspect = aspect
+			};
+
+			await ValidatePropertyInitValue(image, () => image.Aspect, GetNativeAspect, aspect);
+		}
+
+		[Theory(Skip = "Image needs to use ContainerView to handle Brushes properly.")]
+		[InlineData("#FF0000")]
+		[InlineData("#00FF00")]
+		[InlineData("#000000")]
+		public async Task InvalidSourceFailsToLoad(string colorHex)
+		{
+			var color = Color.FromHex(colorHex);
+
+			var image = new ImageStub
+			{
+				Background = new SolidPaintStub(color),
+				Source = new FileImageSourceStub("bad path"),
+			};
+
+			var order = new List<string>();
+			Exception exception = null;
+
+			image.LoadingStarted += () => order.Add($"LoadingStarted");
+			image.LoadingCompleted += successful => order.Add($"LoadingCompleted({successful})");
+			image.LoadingFailed += ex =>
+			{
+				order.Add($"LoadingFailed");
+				exception = ex;
+			};
+
+			await InvokeOnMainThreadAsync(async () =>
+			{
+				var handler = CreateHandler(image);
+
+				await image.Wait();
+
+#if __ANDROID__
+				handler.NativeView.SetMinimumHeight(1);
+				handler.NativeView.SetMinimumWidth(1);
+#endif
+
+				await handler.NativeView.AssertContainsColor(color);
+			});
+
+			Assert.Equal(new[] { "LoadingStarted", "LoadingFailed" }, order);
+			Assert.NotNull(exception);
+		}
+
+		[Fact]
+		public async Task<List<(string Member, object Value)>> ImageLoadSequenceIsCorrect()
+		{
+			var image = new ImageStub
+			{
+				Background = new SolidPaintStub(Colors.Black)
+			};
+
+			var order = new ConcurrentQueue<string>();
+
+			return await InvokeOnMainThreadAsync(async () =>
+			{
+				// get the handler and reset things we don't care about
+				var handler = CreateHandler<CountedImageHandler>(image);
+				await image.Wait();
+				handler.ImageEvents.Clear();
+
+				// get the service we are going to test with
+				var provider = handler.Services.GetRequiredService<IImageSourceServiceProvider>();
+				var imageService = provider.GetRequiredImageSourceService<CountedImageSourceStub>();
+				var countedService = Assert.IsType<CountedImageSourceServiceStub>(imageService);
+
+				// hook up the listeners
+				order.Enqueue("Before Starting");
+				var startingTask = Task.Run(async () =>
+				{
+					countedService.Starting.WaitOne();
+					order.Enqueue("Starting");
+
+					await Task.Delay(1);
+
+					order.Enqueue("DoWork");
+					countedService.DoWork.Set();
+				});
+				var finishingTask = Task.Run(() =>
+				{
+					countedService.Finishing.WaitOne();
+					order.Enqueue("Finishing");
+				});
+
+				// set & apply the image source
+				image.Source = new CountedImageSourceStub(Colors.Blue, true);
+				handler.UpdateValue(nameof(IImage.Source));
+
+				// wait until everything is complete
+				await Task.WhenAll(image.Wait(), startingTask, finishingTask);
+
+				// verify that it all happened in the order as expected
+				order.Enqueue("After Finishing");
+				Assert.Equal(new[] { "Before Starting", "Starting", "DoWork", "Finishing", "After Finishing" }, order.ToArray());
+
+				// make sure it did actually work
+				await handler.NativeView.AssertContainsColor(Colors.Blue);
+
+				return handler.ImageEvents;
+			});
+		}
+
+		[Fact]
+		public async Task<List<(string Member, object Value)>> InterruptingLoadCancelsAndStartsOver()
+		{
+			var image = new ImageStub
+			{
+				Background = new SolidPaintStub(Colors.Black)
+			};
+
+			var order = new List<string>();
+
+			image.LoadingStarted += () => order.Add($"LoadingStarted");
+			image.LoadingCompleted += successful => order.Add($"LoadingCompleted({successful})");
+			image.LoadingFailed += exception => order.Add($"LoadingFailed({exception})");
+
+			var events = await InvokeOnMainThreadAsync(async () =>
+			{
+				// get the handler and reset things we don't care about
+				var handler = CreateHandler<CountedImageHandler>(image);
+				await image.Wait();
+				handler.ImageEvents.Clear();
+
+				// get the service we are going to test with
+				var provider = handler.Services.GetRequiredService<IImageSourceServiceProvider>();
+				var imageService = provider.GetRequiredImageSourceService<CountedImageSourceStub>();
+				var countedService = Assert.IsType<CountedImageSourceServiceStub>(imageService);
+
+				// hook up the listeners
+				var startingTask = Task.Run(async () =>
+				{
+					countedService.Starting.WaitOne();
+
+					// set & apply the SECOND image source
+					await InvokeOnMainThreadAsync(async () =>
+					{
+						image.Source = new CountedImageSourceStub(Colors.Red);
+						handler.UpdateValue(nameof(IImage.Source));
+						await image.Wait();
+					});
+
+					// let the FIRST one continue
+					countedService.DoWork.Set();
+				});
+
+				// set & apply the FIRST image source
+				image.Source = new CountedImageSourceStub(Colors.Blue, true);
+				handler.UpdateValue(nameof(IImage.Source));
+				await image.Wait();
+				await startingTask;
+				await image.Wait();
+
+				// make sure it did actually work
+				await handler.NativeView.AssertContainsColor(Colors.Red);
+
+				return handler.ImageEvents;
+			});
+
+			Assert.Equal(new[] { "LoadingStarted", "LoadingStarted", "LoadingCompleted(True)", "LoadingCompleted(False)" }, order);
+
+			return events;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Handlers/Image/ImageHandlerTests.iOS.cs b/src/Core/tests/DeviceTests/Handlers/Image/ImageHandlerTests.iOS.cs
new file mode 100644
index 000000000000..9f2cc81f724d
--- /dev/null
+++ b/src/Core/tests/DeviceTests/Handlers/Image/ImageHandlerTests.iOS.cs
@@ -0,0 +1,143 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.Maui.DeviceTests.Stubs;
+using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Handlers;
+using UIKit;
+using Xunit;
+
+namespace Microsoft.Maui.DeviceTests
+{
+	public partial class ImageHandlerTests
+	{
+		[Theory(Skip = "Image needs to use ContainerView to handle Brushes properly.")]
+		[InlineData("#FF0000")]
+		[InlineData("#00FF00")]
+		[InlineData("#000000")]
+		public async Task InitializingNullSourceOnlyUpdatesNull(string colorHex)
+		{
+			var expectedColor = Color.FromHex(colorHex);
+
+			var image = new ImageStub
+			{
+				Background = new SolidPaintStub(expectedColor),
+			};
+
+			await InvokeOnMainThreadAsync(async () =>
+			{
+				var handler = CreateHandler<CountedImageHandler>(image);
+
+				await image.Wait();
+
+				Assert.Single(handler.ImageEvents);
+				Assert.Equal("Image", handler.ImageEvents[0].Member);
+				Assert.Null(handler.ImageEvents[0].Value);
+
+				await handler.NativeView.AssertContainsColor(expectedColor);
+			});
+		}
+
+		[Fact]
+		public async Task InitializingSourceOnlyUpdatesImageOnce()
+		{
+			var image = new ImageStub
+			{
+				Background = new SolidPaintStub(Colors.Black),
+				Source = new FileImageSourceStub("red.png"),
+			};
+
+			await InvokeOnMainThreadAsync(async () =>
+			{
+				var handler = CreateHandler<CountedImageHandler>(image);
+
+				await image.Wait();
+
+				await handler.NativeView.AssertContainsColor(Colors.Red);
+
+				Assert.Equal(2, handler.ImageEvents.Count);
+				Assert.Equal("Image", handler.ImageEvents[0].Member);
+				Assert.Null(handler.ImageEvents[0].Value);
+				Assert.Equal("Image", handler.ImageEvents[1].Member);
+				Assert.IsType<UIImage>(handler.ImageEvents[1].Value);
+			});
+		}
+
+		[Fact]
+		public async Task UpdatingSourceOnlyUpdatesDrawableTwice()
+		{
+			var image = new ImageStub
+			{
+				Background = new SolidPaintStub(Colors.Black),
+				Source = new FileImageSourceStub("red.png"),
+			};
+
+			await InvokeOnMainThreadAsync(async () =>
+			{
+				var handler = CreateHandler<CountedImageHandler>(image);
+
+				await image.Wait();
+
+				await handler.NativeView.AssertContainsColor(Colors.Red);
+
+				handler.ImageEvents.Clear();
+
+				image.Source = new FileImageSourceStub("blue.png");
+				handler.UpdateValue(nameof(IImage.Source));
+
+				await image.Wait();
+
+				await handler.NativeView.AssertContainsColor(Colors.Blue);
+
+				Assert.Equal(2, handler.ImageEvents.Count);
+				Assert.Equal("Image", handler.ImageEvents[0].Member);
+				Assert.Null(handler.ImageEvents[0].Value);
+				Assert.Equal("Image", handler.ImageEvents[1].Member);
+				Assert.IsType<UIImage>(handler.ImageEvents[1].Value);
+			});
+		}
+
+		[Fact]
+		public async Task ImageLoadSequenceIsCorrectWithChecks()
+		{
+			var events = await ImageLoadSequenceIsCorrect();
+
+			Assert.Equal(2, events.Count);
+			Assert.Equal("Image", events[0].Member);
+			Assert.Null(events[0].Value);
+			Assert.Equal("Image", events[1].Member);
+			var image = Assert.IsType<UIImage>(events[1].Value);
+			image.AssertContainsColor(Colors.Blue.ToNative());
+		}
+
+		[Fact]
+		public async Task InterruptingLoadCancelsAndStartsOverWithChecks()
+		{
+			var events = await InterruptingLoadCancelsAndStartsOver();
+
+			Assert.Equal(3, events.Count);
+			Assert.Equal("Image", events[0].Member);
+			Assert.Null(events[0].Value);
+			Assert.Equal("Image", events[1].Member);
+			Assert.Null(events[1].Value);
+			Assert.Equal("Image", events[2].Member);
+			var image = Assert.IsType<UIImage>(events[2].Value);
+			image.AssertContainsColor(Colors.Red.ToNative());
+		}
+
+		UIImageView GetNativeImageView(ImageHandler imageHandler) =>
+			imageHandler.NativeView;
+
+		bool GetNativeIsAnimationPlaying(ImageHandler imageHandler) =>
+			GetNativeImageView(imageHandler).IsAnimating;
+
+		Aspect GetNativeAspect(ImageHandler imageHandler) =>
+			GetNativeImageView(imageHandler).ContentMode switch
+			{
+				UIViewContentMode.ScaleAspectFit => Aspect.AspectFit,
+				UIViewContentMode.ScaleAspectFill => Aspect.AspectFill,
+				UIViewContentMode.ScaleToFill => Aspect.Fill,
+				UIViewContentMode.Center => Aspect.Center,
+				_ => throw new ArgumentOutOfRangeException("Aspect")
+			};
+	}
+}
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Handlers/Label/LabelHandlerTests.Android.cs b/src/Core/tests/DeviceTests/Handlers/Label/LabelHandlerTests.Android.cs
index df898498e93a..4d9bf9af0469 100644
--- a/src/Core/tests/DeviceTests/Handlers/Label/LabelHandlerTests.Android.cs
+++ b/src/Core/tests/DeviceTests/Handlers/Label/LabelHandlerTests.Android.cs
@@ -124,7 +124,7 @@ public async Task TextDecorationsInitializesCorrectly()
 		}
 
 		TextView GetNativeLabel(LabelHandler labelHandler) =>
-			(TextView)labelHandler.NativeView;
+			labelHandler.NativeView;
 
 		string GetNativeText(LabelHandler labelHandler) =>
 			GetNativeLabel(labelHandler).Text;
@@ -139,7 +139,7 @@ double GetNativeUnscaledFontSize(LabelHandler labelHandler)
 		}
 
 		bool GetNativeIsBold(LabelHandler labelHandler) =>
-			GetNativeLabel(labelHandler).Typeface.IsBold;
+			GetNativeLabel(labelHandler).Typeface.GetFontWeight() == FontWeight.Bold;
 
 		bool GetNativeIsItalic(LabelHandler labelHandler) =>
 			GetNativeLabel(labelHandler).Typeface.IsItalic;
@@ -153,14 +153,6 @@ bool GetNativeIsItalic(LabelHandler labelHandler) =>
 		int GetNativeMaxLines(LabelHandler labelHandler) =>
 			GetNativeLabel(labelHandler).MaxLines;
 
-		Task ValidateNativeBackgroundColor(ILabel label, Color color)
-		{
-			return InvokeOnMainThreadAsync(() =>
-			{
-				return GetNativeLabel(CreateHandler(label)).AssertContainsColor(color);
-			});
-		}
-
 		(double left, double top, double right, double bottom) GetNativePadding(Android.Views.View view)
 		{
 			return (view.PaddingLeft, view.PaddingTop, view.PaddingRight, view.PaddingBottom);
@@ -177,5 +169,15 @@ PaintFlags GetNativeTextDecorations(LabelHandler labelHandler) =>
 
 		float GetNativeLineHeight(LabelHandler labelHandler) =>
 			GetNativeLabel(labelHandler).LineSpacingMultiplier;
+
+		Task ValidateHasColor(ILabel label, Color color, Action action = null)
+		{
+			return InvokeOnMainThreadAsync(() =>
+			{
+				var nativeLabel = GetNativeLabel(CreateHandler(label));
+				action?.Invoke();
+				nativeLabel.AssertContainsColor(color);
+			});
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Handlers/Label/LabelHandlerTests.cs b/src/Core/tests/DeviceTests/Handlers/Label/LabelHandlerTests.cs
index 7a70830d0c11..951b70793494 100644
--- a/src/Core/tests/DeviceTests/Handlers/Label/LabelHandlerTests.cs
+++ b/src/Core/tests/DeviceTests/Handlers/Label/LabelHandlerTests.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Threading.Tasks;
 using Microsoft.Maui.DeviceTests.Stubs;
 using Microsoft.Maui.Graphics;
@@ -10,16 +9,18 @@ namespace Microsoft.Maui.DeviceTests
 	[Category(TestCategory.Label)]
 	public partial class LabelHandlerTests : HandlerTestBase<LabelHandler, LabelStub>
 	{
-		[Fact(DisplayName = "Background Color Initializes Correctly")]
-		public async Task BackgroundColorInitializesCorrectly()
+		[Fact(DisplayName = "Background Initializes Correctly")]
+		public async Task BackgroundInitializesCorrectly()
 		{
+			var brush = new SolidPaintStub(Colors.Blue);
+
 			var label = new LabelStub()
 			{
-				BackgroundColor = Colors.Blue,
+				Background = brush,
 				Text = "Test"
 			};
 
-			await ValidateNativeBackgroundColor(label, Colors.Blue);
+			await ValidateHasColor(label, Colors.Blue);
 		}
 
 		[Fact(DisplayName = "Text Initializes Correctly")]
@@ -62,20 +63,20 @@ public async Task FontSizeInitializesCorrectly(int fontSize)
 		}
 
 		[Theory(DisplayName = "Font Attributes Initialize Correctly")]
-		[InlineData(FontAttributes.None, false, false)]
-		[InlineData(FontAttributes.Bold, true, false)]
-		[InlineData(FontAttributes.Italic, false, true)]
-		[InlineData(FontAttributes.Bold | FontAttributes.Italic, true, true)]
-		public async Task FontAttributesInitializeCorrectly(FontAttributes attributes, bool isBold, bool isItalic)
+		[InlineData(FontWeight.Regular, false, false)]
+		[InlineData(FontWeight.Bold, true, false)]
+		[InlineData(FontWeight.Regular, false, true)]
+		[InlineData(FontWeight.Bold, true, true)]
+		public async Task FontAttributesInitializeCorrectly(FontWeight weight, bool isBold, bool isItalic)
 		{
 			var label = new LabelStub()
 			{
 				Text = "Test",
-				Font = Font.OfSize("Arial", 10).WithAttributes(attributes)
+				Font = Font.OfSize("Arial", 10, weight, isItalic ? FontSlant.Italic : FontSlant.Default)
 			};
 
-			await ValidatePropertyInitValue(label, () => label.Font.FontAttributes.HasFlag(FontAttributes.Bold), GetNativeIsBold, isBold);
-			await ValidatePropertyInitValue(label, () => label.Font.FontAttributes.HasFlag(FontAttributes.Italic), GetNativeIsItalic, isItalic);
+			await ValidatePropertyInitValue(label, () => label.Font.Weight == FontWeight.Bold, GetNativeIsBold, isBold);
+			await ValidatePropertyInitValue(label, () => label.Font.FontSlant == FontSlant.Italic, GetNativeIsItalic, isItalic);
 		}
 
 		[Fact(DisplayName = "CharacterSpacing Initializes Correctly")]
@@ -168,6 +169,49 @@ await ValidateUnrelatedPropertyUnaffected(
 				() => label.Font = Font.SystemFontOfSize(newSize));
 		}
 
+		[Theory(DisplayName = "Font Family and Weight Initializes Correctly")]
+		[InlineData(null, FontWeight.Regular, FontSlant.Default)]
+		[InlineData(null, FontWeight.Regular, FontSlant.Italic)]
+		[InlineData(null, FontWeight.Bold, FontSlant.Default)]
+		[InlineData(null, FontWeight.Bold, FontSlant.Italic)]
+		[InlineData("Lobster Two", FontWeight.Regular, FontSlant.Default)]
+		[InlineData("Lobster Two", FontWeight.Regular, FontSlant.Italic)]
+		[InlineData("Lobster Two", FontWeight.Bold, FontSlant.Default)]
+		[InlineData("Lobster Two", FontWeight.Bold, FontSlant.Italic)]
+#if !__IOS__
+		// iOS cannot force a font to be bold like all other OS
+		[InlineData("Dokdo", FontWeight.Regular, FontSlant.Default)]
+		[InlineData("Dokdo", FontWeight.Regular, FontSlant.Italic)]
+		[InlineData("Dokdo", FontWeight.Bold, FontSlant.Default)]
+		[InlineData("Dokdo", FontWeight.Bold, FontSlant.Italic)]
+#endif
+#if __ANDROID__
+		// "monospace" is a special font name on Android
+		[InlineData("monospace", FontWeight.Regular, FontSlant.Default)]
+		[InlineData("monospace", FontWeight.Regular, FontSlant.Italic)]
+		[InlineData("monospace", FontWeight.Bold, FontSlant.Default)]
+		[InlineData("monospace", FontWeight.Bold, FontSlant.Italic)]
+#endif
+		public async Task FontFamilyAndAttributesInitializesCorrectly(string family, FontWeight weight, FontSlant slant)
+		{
+			var label = new LabelStub
+			{
+				Text = "Test",
+				Font = Font.OfSize(family, 30, weight, slant)
+			};
+
+			var (isBold, isItalic) = await GetValueAsync(label, (handler) =>
+			{
+				var isBold = GetNativeIsBold(handler);
+				var isItalic = GetNativeIsItalic(handler);
+
+				return (isBold, isItalic);
+			});
+
+			Assert.Equal(weight == FontWeight.Bold, isBold);
+			Assert.Equal(slant == FontSlant.Italic, isItalic);
+		}
+
 		[Theory(DisplayName = "Updating Text Does Not Affect HorizontalTextAlignment")]
 		[InlineData("Short", "Longer Text")]
 		[InlineData("Long thext here", "Short")]
diff --git a/src/Core/tests/DeviceTests/Handlers/Label/LabelHandlerTests.iOS.cs b/src/Core/tests/DeviceTests/Handlers/Label/LabelHandlerTests.iOS.cs
index bccb092dff0f..38482537dfd3 100644
--- a/src/Core/tests/DeviceTests/Handlers/Label/LabelHandlerTests.iOS.cs
+++ b/src/Core/tests/DeviceTests/Handlers/Label/LabelHandlerTests.iOS.cs
@@ -174,6 +174,33 @@ public async Task LineHeightSurvivesTextDecorations()
 			attributedText.AssertHasUnderline();
 		}
 
+		[Theory(DisplayName = "HorizontalTextAlignment adjusts for FlowDirection")]
+		[InlineData(TextAlignment.Start, FlowDirection.LeftToRight, UITextAlignment.Left)]
+		[InlineData(TextAlignment.End, FlowDirection.LeftToRight, UITextAlignment.Right)]
+		[InlineData(TextAlignment.Start, FlowDirection.RightToLeft, UITextAlignment.Right)]
+		[InlineData(TextAlignment.End, FlowDirection.RightToLeft, UITextAlignment.Left)]
+		public async Task HorizontalTextAlignmentAdjustsForFlowDirection(TextAlignment alignment, FlowDirection flowDirection, UITextAlignment expected)
+		{
+			var label = new LabelStub
+			{
+				Text = "This is TEXT!",
+				HorizontalTextAlignment = alignment,
+				FlowDirection = flowDirection
+			};
+
+
+			var values = await GetValueAsync(label, (handler) =>
+			{
+				return new
+				{
+					ViewValue = label.HorizontalTextAlignment,
+					NativeViewValue = GetNativeHorizontalTextAlignment(handler)
+				};
+			});
+
+			Assert.Equal(expected, values.NativeViewValue);
+		}
+
 		UILabel GetNativeLabel(LabelHandler labelHandler) =>
 			(UILabel)labelHandler.NativeView;
 
@@ -214,14 +241,6 @@ async Task<NSAttributedString> GetAttributedText(LabelHandler labelHandler)
 		UITextAlignment GetNativeHorizontalTextAlignment(LabelHandler labelHandler) =>
 			GetNativeLabel(labelHandler).TextAlignment;
 
-		Task ValidateNativeBackgroundColor(ILabel label, Color color)
-		{
-			return InvokeOnMainThreadAsync(() =>
-			{
-				return GetNativeLabel(CreateHandler(label)).AssertContainsColor(color);
-			});
-		}
-
 		UILineBreakMode GetNativeLineBreakMode(LabelHandler labelHandler) =>
 			GetNativeLabel(labelHandler).LineBreakMode;
 
@@ -239,5 +258,15 @@ double GetNativeLineHeight(LabelHandler labelHandler)
 
 			return paragraphStyle.LineHeightMultiple;
 		}
+
+		Task ValidateHasColor(ILabel label, Color color, Action action = null)
+		{
+			return InvokeOnMainThreadAsync(() =>
+			{
+				var nativeLabel = GetNativeLabel(CreateHandler(label));
+				action?.Invoke();
+				nativeLabel.AssertContainsColor(color);
+			});
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Handlers/Picker/PickerHandlerTests.Android.cs b/src/Core/tests/DeviceTests/Handlers/Picker/PickerHandlerTests.Android.cs
index ac2bfd046837..e02800ec2e5a 100644
--- a/src/Core/tests/DeviceTests/Handlers/Picker/PickerHandlerTests.Android.cs
+++ b/src/Core/tests/DeviceTests/Handlers/Picker/PickerHandlerTests.Android.cs
@@ -81,7 +81,7 @@ double GetNativeUnscaledFontSize(PickerHandler pickerHandler)
 		}
 
 		bool GetNativeIsBold(PickerHandler pickerHandler) =>
-			GetNativePicker(pickerHandler).Typeface.IsBold;
+			GetNativePicker(pickerHandler).Typeface.GetFontWeight() == FontWeight.Bold;
 
 		bool GetNativeIsItalic(PickerHandler pickerHandler) =>
 			GetNativePicker(pickerHandler).Typeface.IsItalic;
diff --git a/src/Core/tests/DeviceTests/Handlers/Picker/PickerHandlerTests.cs b/src/Core/tests/DeviceTests/Handlers/Picker/PickerHandlerTests.cs
index 070df99bdaae..319834b8d8ed 100644
--- a/src/Core/tests/DeviceTests/Handlers/Picker/PickerHandlerTests.cs
+++ b/src/Core/tests/DeviceTests/Handlers/Picker/PickerHandlerTests.cs
@@ -36,11 +36,11 @@ public async Task FontSizeInitializesCorrectly(int fontSize)
 		}
 
 		[Theory(DisplayName = "Font Attributes Initialize Correctly")]
-		[InlineData(FontAttributes.None, false, false)]
-		[InlineData(FontAttributes.Bold, true, false)]
-		[InlineData(FontAttributes.Italic, false, true)]
-		[InlineData(FontAttributes.Bold | FontAttributes.Italic, true, true)]
-		public async Task FontAttributesInitializeCorrectly(FontAttributes attributes, bool isBold, bool isItalic)
+		[InlineData(FontWeight.Regular, false, false)]
+		[InlineData(FontWeight.Bold, true, false)]
+		[InlineData(FontWeight.Regular, false, true)]
+		[InlineData(FontWeight.Bold, true, true)]
+		public async Task FontAttributesInitializeCorrectly(FontWeight weight, bool isBold, bool isItalic)
 		{
 			var items = new List<string>
 			{
@@ -52,14 +52,14 @@ public async Task FontAttributesInitializeCorrectly(FontAttributes attributes, b
 			var picker = new PickerStub()
 			{
 				Title = "Select an Item",
-				Font = Font.OfSize("Arial", 10).WithAttributes(attributes)
+				Font = Font.OfSize("Arial", 10, weight, isItalic ? FontSlant.Italic : FontSlant.Default)
 			};
 
 			picker.ItemsSource = items;
 			picker.SelectedIndex = 0;
 
-			await ValidatePropertyInitValue(picker, () => picker.Font.FontAttributes.HasFlag(FontAttributes.Bold), GetNativeIsBold, isBold);
-			await ValidatePropertyInitValue(picker, () => picker.Font.FontAttributes.HasFlag(FontAttributes.Italic), GetNativeIsItalic, isItalic);
+			await ValidatePropertyInitValue(picker, () => picker.Font.Weight == FontWeight.Bold, GetNativeIsBold, isBold);
+			await ValidatePropertyInitValue(picker, () => picker.Font.FontSlant == FontSlant.Italic, GetNativeIsItalic, isItalic);
 		}
 
 		[Theory(DisplayName = "Updating Font Does Not Affect HorizontalTextAlignment")]
diff --git a/src/Core/tests/DeviceTests/Handlers/Picker/PickerHandlerTests.iOS.cs b/src/Core/tests/DeviceTests/Handlers/Picker/PickerHandlerTests.iOS.cs
index a5e4971f11da..77b2dde7d6ad 100644
--- a/src/Core/tests/DeviceTests/Handlers/Picker/PickerHandlerTests.iOS.cs
+++ b/src/Core/tests/DeviceTests/Handlers/Picker/PickerHandlerTests.iOS.cs
@@ -46,7 +46,7 @@ bool GetNativeIsBold(PickerHandler pickerHandler) =>
 
 		bool GetNativeIsItalic(PickerHandler pickerHandler) =>
 			GetNativePicker(pickerHandler).Font.FontDescriptor.SymbolicTraits.HasFlag(UIFontDescriptorSymbolicTraits.Italic);
-		
+
 		UITextAlignment GetNativeHorizontalTextAlignment(PickerHandler pickerHandler) =>
 			GetNativePicker(pickerHandler).TextAlignment;
 	}
diff --git a/src/Core/tests/DeviceTests/Handlers/SearchBar/SearchBarHandlerTests.Android.cs b/src/Core/tests/DeviceTests/Handlers/SearchBar/SearchBarHandlerTests.Android.cs
index 495de4309a4f..4246040f0865 100644
--- a/src/Core/tests/DeviceTests/Handlers/SearchBar/SearchBarHandlerTests.Android.cs
+++ b/src/Core/tests/DeviceTests/Handlers/SearchBar/SearchBarHandlerTests.Android.cs
@@ -110,7 +110,7 @@ bool GetNativeIsBold(SearchBarHandler searchBarHandler)
 			if (editText == null)
 				return false;
 
-			return editText.Typeface.IsBold;
+			return editText.Typeface.GetFontWeight() == FontWeight.Bold;
 		}
 
 		bool GetNativeIsItalic(SearchBarHandler searchBarHandler)
diff --git a/src/Core/tests/DeviceTests/Handlers/SearchBar/SearchBarHandlerTests.cs b/src/Core/tests/DeviceTests/Handlers/SearchBar/SearchBarHandlerTests.cs
index e9d962107941..b5a19037b396 100644
--- a/src/Core/tests/DeviceTests/Handlers/SearchBar/SearchBarHandlerTests.cs
+++ b/src/Core/tests/DeviceTests/Handlers/SearchBar/SearchBarHandlerTests.cs
@@ -70,20 +70,20 @@ public async Task FontSizeInitializesCorrectly(int fontSize)
 		}
 
 		[Theory(DisplayName = "Font Attributes Initialize Correctly")]
-		[InlineData(FontAttributes.None, false, false)]
-		[InlineData(FontAttributes.Bold, true, false)]
-		[InlineData(FontAttributes.Italic, false, true)]
-		[InlineData(FontAttributes.Bold | FontAttributes.Italic, true, true)]
-		public async Task FontAttributesInitializeCorrectly(FontAttributes attributes, bool isBold, bool isItalic)
+		[InlineData(FontWeight.Regular, false, false)]
+		[InlineData(FontWeight.Bold, true, false)]
+		[InlineData(FontWeight.Regular, false, true)]
+		[InlineData(FontWeight.Bold, true, true)]
+		public async Task FontAttributesInitializeCorrectly(FontWeight weight, bool isBold, bool isItalic)
 		{
 			var searchBar = new SearchBarStub()
 			{
 				Text = "Test",
-				Font = Font.OfSize("Arial", 10).WithAttributes(attributes)
+				Font = Font.OfSize("Arial", 10, weight, isItalic ? FontSlant.Italic : FontSlant.Default),
 			};
 
-			await ValidatePropertyInitValue(searchBar, () => searchBar.Font.FontAttributes.HasFlag(FontAttributes.Bold), GetNativeIsBold, isBold);
-			await ValidatePropertyInitValue(searchBar, () => searchBar.Font.FontAttributes.HasFlag(FontAttributes.Italic), GetNativeIsItalic, isItalic);
+			await ValidatePropertyInitValue(searchBar, () => searchBar.Font.Weight == FontWeight.Bold, GetNativeIsBold, isBold);
+			await ValidatePropertyInitValue(searchBar, () => searchBar.Font.FontSlant == FontSlant.Italic, GetNativeIsItalic, isItalic);
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Handlers/Stepper/StepperHandlerTests.Android.cs b/src/Core/tests/DeviceTests/Handlers/Stepper/StepperHandlerTests.Android.cs
index 520883ed6aa5..6a4ba25aca8a 100644
--- a/src/Core/tests/DeviceTests/Handlers/Stepper/StepperHandlerTests.Android.cs
+++ b/src/Core/tests/DeviceTests/Handlers/Stepper/StepperHandlerTests.Android.cs
@@ -1,16 +1,15 @@
-using System.Threading.Tasks;
-using Android.Graphics.Drawables;
+using System;
+using System.Threading.Tasks;
 using Android.Widget;
 using Microsoft.Maui.Graphics;
 using Microsoft.Maui.Handlers;
-using Xunit;
 
 namespace Microsoft.Maui.DeviceTests
 {
 	public partial class StepperHandlerTests
 	{
 		LinearLayout GetNativeStepper(StepperHandler stepperHandler) =>
-			(LinearLayout)stepperHandler.NativeView;
+			stepperHandler.NativeView;
 
 		double GetNativeValue(StepperHandler stepperHandler)
 		{
@@ -45,10 +44,14 @@ double GetNativeMinimum(StepperHandler stepperHandler)
 			return 0;
 		}
 
-		async Task ValidateNativeBackgroundColor(IStepper stepper, Color color)
+		Task ValidateHasColor(IStepper stepper, Color color, Action action = null)
 		{
-			var expected = await GetValueAsync(stepper, handler => ((ColorDrawable)GetNativeStepper(handler).Background).Color.ToColor());
-			Assert.Equal(expected, color);
+			return InvokeOnMainThreadAsync(() =>
+			{
+				var nativeStepper = GetNativeStepper(CreateHandler(stepper));
+				action?.Invoke();
+				nativeStepper.AssertContainsColor(color);
+			});
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Handlers/Stepper/StepperHandlerTests.cs b/src/Core/tests/DeviceTests/Handlers/Stepper/StepperHandlerTests.cs
index ef404d322e6f..c7b56a64b46c 100644
--- a/src/Core/tests/DeviceTests/Handlers/Stepper/StepperHandlerTests.cs
+++ b/src/Core/tests/DeviceTests/Handlers/Stepper/StepperHandlerTests.cs
@@ -46,15 +46,15 @@ public async Task MinimumInitializesCorrectly()
 			await ValidatePropertyInitValue(stepper, () => stepper.Minimum, GetNativeMinimum, stepper.Minimum);
 		}
 
-		[Fact(DisplayName = "Background Color Initializes Correctly")]
-		public async Task BackgroundColorInitializesCorrectly()
+		[Fact(DisplayName = "Background Initializes Correctly")]
+		public async Task BackgroundInitializesCorrectly()
 		{
 			var stepper = new StepperStub()
 			{
-				BackgroundColor = Colors.Red
+				Background = new SolidPaintStub(Colors.Red)
 			};
 
-			await ValidateNativeBackgroundColor(stepper, Colors.Red);
+			await ValidateHasColor(stepper, Colors.Red);
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Handlers/Stepper/StepperHandlerTests.iOS.cs b/src/Core/tests/DeviceTests/Handlers/Stepper/StepperHandlerTests.iOS.cs
index 3713fa89f2b4..1b93ec640178 100644
--- a/src/Core/tests/DeviceTests/Handlers/Stepper/StepperHandlerTests.iOS.cs
+++ b/src/Core/tests/DeviceTests/Handlers/Stepper/StepperHandlerTests.iOS.cs
@@ -1,15 +1,15 @@
-using System.Threading.Tasks;
+using System;
+using System.Threading.Tasks;
 using Microsoft.Maui.Graphics;
 using Microsoft.Maui.Handlers;
 using UIKit;
-using Xunit;
 
 namespace Microsoft.Maui.DeviceTests
 {
 	public partial class StepperHandlerTests
 	{
 		UIStepper GetNativeStepper(StepperHandler stepperHandler) =>
-			(UIStepper)stepperHandler.NativeView;
+			stepperHandler.NativeView;
 
 		double GetNativeValue(StepperHandler stepperHandler) =>
 			GetNativeStepper(stepperHandler).Value;
@@ -20,10 +20,14 @@ double GetNativeMaximum(StepperHandler stepperHandler) =>
 		double GetNativeMinimum(StepperHandler stepperHandler) =>
 			GetNativeStepper(stepperHandler).MinimumValue;
 
-		async Task ValidateNativeBackgroundColor(IStepper stepper, Color color)
+		Task ValidateHasColor(IStepper stepper, Color color, Action action = null)
 		{
-			var expected = await GetValueAsync(stepper, handler => GetNativeStepper(handler).BackgroundColor.ToColor());
-			Assert.Equal(expected, color);
+			return InvokeOnMainThreadAsync(() =>
+			{
+				var nativeStepper = GetNativeStepper(CreateHandler(stepper));
+				action?.Invoke();
+				nativeStepper.AssertContainsColor(color);
+			});
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Handlers/TimePicker/TimePickerHandlerTests.Android.cs b/src/Core/tests/DeviceTests/Handlers/TimePicker/TimePickerHandlerTests.Android.cs
index 803f9f36e778..e20a5b43fedc 100644
--- a/src/Core/tests/DeviceTests/Handlers/TimePicker/TimePickerHandlerTests.Android.cs
+++ b/src/Core/tests/DeviceTests/Handlers/TimePicker/TimePickerHandlerTests.Android.cs
@@ -98,7 +98,7 @@ double GetNativeUnscaledFontSize(TimePickerHandler timePickerHandler)
 		}
 
 		bool GetNativeIsBold(TimePickerHandler timePickerHandler) =>
-			GetNativeTimePicker(timePickerHandler).Typeface.IsBold;
+			GetNativeTimePicker(timePickerHandler).Typeface.GetFontWeight() == FontWeight.Bold;
 
 		bool GetNativeIsItalic(TimePickerHandler timePickerHandler) =>
 			GetNativeTimePicker(timePickerHandler).Typeface.IsItalic;
diff --git a/src/Core/tests/DeviceTests/Handlers/TimePicker/TimePickerHandlerTests.cs b/src/Core/tests/DeviceTests/Handlers/TimePicker/TimePickerHandlerTests.cs
index 65a7eed96f8c..a8c5545de9f9 100644
--- a/src/Core/tests/DeviceTests/Handlers/TimePicker/TimePickerHandlerTests.cs
+++ b/src/Core/tests/DeviceTests/Handlers/TimePicker/TimePickerHandlerTests.cs
@@ -36,20 +36,20 @@ public async Task FontSizeInitializesCorrectly(int fontSize)
 		}
 
 		[Theory(DisplayName = "Font Attributes Initialize Correctly")]
-		[InlineData(FontAttributes.None, false, false)]
-		[InlineData(FontAttributes.Bold, true, false)]
-		[InlineData(FontAttributes.Italic, false, true)]
-		[InlineData(FontAttributes.Bold | FontAttributes.Italic, true, true)]
-		public async Task FontAttributesInitializeCorrectly(FontAttributes attributes, bool isBold, bool isItalic)
+		[InlineData(FontWeight.Regular, false, false)]
+		[InlineData(FontWeight.Bold, true, false)]
+		[InlineData(FontWeight.Regular, false, true)]
+		[InlineData(FontWeight.Bold, true, true)]
+		public async Task FontAttributesInitializeCorrectly(FontWeight weight, bool isBold, bool isItalic)
 		{
 			var timePicker = new TimePickerStub()
 			{
 				Time = new TimeSpan(17, 0, 0),
-				Font = Font.OfSize("Arial", 10).WithAttributes(attributes)
+				Font = Font.OfSize("Arial", 10, weight, isItalic ? FontSlant.Italic : FontSlant.Default)
 			};
 
-			await ValidatePropertyInitValue(timePicker, () => timePicker.Font.FontAttributes.HasFlag(FontAttributes.Bold), GetNativeIsBold, isBold);
-			await ValidatePropertyInitValue(timePicker, () => timePicker.Font.FontAttributes.HasFlag(FontAttributes.Italic), GetNativeIsItalic, isItalic);
+			await ValidatePropertyInitValue(timePicker, () => timePicker.Font.Weight == FontWeight.Bold, GetNativeIsBold, isBold);
+			await ValidatePropertyInitValue(timePicker, () => timePicker.Font.FontSlant == FontSlant.Italic, GetNativeIsItalic, isItalic);
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Images/animated_heart.gif b/src/Core/tests/DeviceTests/Images/animated_heart.gif
new file mode 100644
index 000000000000..a7dfec7ea5cd
Binary files /dev/null and b/src/Core/tests/DeviceTests/Images/animated_heart.gif differ
diff --git a/src/Core/tests/DeviceTests/Images/black.png b/src/Core/tests/DeviceTests/Images/black.png
new file mode 100644
index 000000000000..02c20119812a
Binary files /dev/null and b/src/Core/tests/DeviceTests/Images/black.png differ
diff --git a/src/Core/tests/DeviceTests/Images/blue.png b/src/Core/tests/DeviceTests/Images/blue.png
new file mode 100644
index 000000000000..35dbe7e50477
Binary files /dev/null and b/src/Core/tests/DeviceTests/Images/blue.png differ
diff --git a/src/Core/tests/DeviceTests/Images/green.png b/src/Core/tests/DeviceTests/Images/green.png
new file mode 100644
index 000000000000..2c3c9f445d51
Binary files /dev/null and b/src/Core/tests/DeviceTests/Images/green.png differ
diff --git a/src/Core/tests/DeviceTests/Images/red.png b/src/Core/tests/DeviceTests/Images/red.png
new file mode 100644
index 000000000000..3587e2727c39
Binary files /dev/null and b/src/Core/tests/DeviceTests/Images/red.png differ
diff --git a/src/Core/tests/DeviceTests/Images/white.png b/src/Core/tests/DeviceTests/Images/white.png
new file mode 100644
index 000000000000..694884a9e6a8
Binary files /dev/null and b/src/Core/tests/DeviceTests/Images/white.png differ
diff --git a/src/Core/tests/DeviceTests/Services/ImageSource/BaseImageSourceServiceTests.Android.cs b/src/Core/tests/DeviceTests/Services/ImageSource/BaseImageSourceServiceTests.Android.cs
new file mode 100644
index 000000000000..d67595eec23c
--- /dev/null
+++ b/src/Core/tests/DeviceTests/Services/ImageSource/BaseImageSourceServiceTests.Android.cs
@@ -0,0 +1,61 @@
+using System;
+using System.IO;
+using Microsoft.Maui.Essentials;
+using Microsoft.Maui.Graphics;
+using Xunit;
+using ABitmap = Android.Graphics.Bitmap;
+using AColor = Android.Graphics.Color;
+
+namespace Microsoft.Maui.DeviceTests
+{
+	public abstract partial class BaseImageSourceServiceTests
+	{
+		protected string CreateBitmapFile(int width, int height, Color color, string filename = null) =>
+			CreateBitmapFile(width, height, color.ToNative(), filename);
+
+		protected string CreateBitmapFile(int width, int height, AColor color, string filename = null)
+		{
+			filename ??= Guid.NewGuid().ToString("N") + ".png";
+			if (!Path.IsPathRooted(filename))
+				filename = Path.Combine(FileSystem.CacheDirectory, Guid.NewGuid().ToString("N"), filename);
+			var dir = Path.GetDirectoryName(filename);
+			if (!Directory.Exists(dir))
+				Directory.CreateDirectory(dir);
+
+			using var src = CreateBitmapStream(width, height, color);
+			using var dst = File.Create(filename);
+			src.CopyTo(dst);
+
+			return filename;
+		}
+
+		protected Stream CreateBitmapStream(int width, int height, Color color) =>
+			CreateBitmapStream(width, height, color.ToNative());
+
+		protected Stream CreateBitmapStream(int width, int height, AColor color)
+		{
+			using var bitmap = CreateBitmap(width, height, color);
+
+			var stream = new MemoryStream();
+
+			var success = bitmap.Compress(ABitmap.CompressFormat.Png, 100, stream);
+			Assert.True(success);
+
+			stream.Position = 0;
+
+			return stream;
+		}
+
+		protected ABitmap CreateBitmap(int width, int height, Color color) =>
+			CreateBitmap(width, height, color.ToNative());
+
+		protected ABitmap CreateBitmap(int width, int height, AColor color)
+		{
+			var bitmap = ABitmap.CreateBitmap(width, height, ABitmap.Config.Argb8888);
+
+			bitmap.EraseColor(color);
+
+			return bitmap;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Services/ImageSource/BaseImageSourceServiceTests.cs b/src/Core/tests/DeviceTests/Services/ImageSource/BaseImageSourceServiceTests.cs
new file mode 100644
index 000000000000..7b3d6442efc8
--- /dev/null
+++ b/src/Core/tests/DeviceTests/Services/ImageSource/BaseImageSourceServiceTests.cs
@@ -0,0 +1,7 @@
+namespace Microsoft.Maui.DeviceTests
+{
+	[Category(TestCategory.ImageSource)]
+	public abstract partial class BaseImageSourceServiceTests : TestBase
+	{
+	}
+}
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Services/ImageSource/BaseImageSourceServiceTests.iOS.cs b/src/Core/tests/DeviceTests/Services/ImageSource/BaseImageSourceServiceTests.iOS.cs
new file mode 100644
index 000000000000..9a1da5b607cb
--- /dev/null
+++ b/src/Core/tests/DeviceTests/Services/ImageSource/BaseImageSourceServiceTests.iOS.cs
@@ -0,0 +1,70 @@
+using System;
+using System.IO;
+using CoreGraphics;
+using Microsoft.Maui.Essentials;
+using Microsoft.Maui.Graphics;
+using UIKit;
+using Xunit;
+
+namespace Microsoft.Maui.DeviceTests
+{
+	public abstract partial class BaseImageSourceServiceTests
+	{
+		protected string CreateBitmapFile(int width, int height, Color color, string filename = null) =>
+			CreateBitmapFile(width, height, color.ToNative(), filename);
+
+		protected string CreateBitmapFile(int width, int height, UIColor color, string filename = null)
+		{
+			filename ??= Guid.NewGuid().ToString("N") + ".png";
+			if (!Path.IsPathRooted(filename))
+				filename = Path.Combine(FileSystem.CacheDirectory, Guid.NewGuid().ToString("N"), filename);
+			var dir = Path.GetDirectoryName(filename);
+			if (!Directory.Exists(dir))
+				Directory.CreateDirectory(dir);
+
+			using var src = CreateBitmapStream(width, height, color);
+			using var dst = File.Create(filename);
+			src.CopyTo(dst);
+
+			return filename;
+		}
+
+		protected Stream CreateBitmapStream(int width, int height, Color color) =>
+			CreateBitmapStream(width, height, color.ToNative());
+
+		protected Stream CreateBitmapStream(int width, int height, UIColor color)
+		{
+			using var bitmap = CreateBitmap(width, height, color);
+
+			var stream = new MemoryStream();
+
+			using var png = bitmap.AsPNG();
+			using var srcStream = png.AsStream();
+			srcStream.CopyTo(stream);
+
+			stream.Position = 0;
+
+			return stream;
+		}
+
+		protected UIImage CreateBitmap(int width, int height, Color color) =>
+			CreateBitmap(width, height, color.ToNative());
+
+		protected UIImage CreateBitmap(int width, int height, UIColor color)
+		{
+			var rect = new CGRect(0, 0, width, height);
+
+			UIGraphics.BeginImageContextWithOptions(rect.Size, false, 1);
+			var context = UIGraphics.GetCurrentContext();
+
+			color.SetFill();
+			context.FillRect(rect);
+
+			var image = UIGraphics.GetImageFromCurrentImageContext();
+
+			UIGraphics.EndImageContext();
+
+			return image.ImageWithRenderingMode(UIImageRenderingMode.AlwaysOriginal);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Services/ImageSource/FileImageSourceServiceTests.Android.cs b/src/Core/tests/DeviceTests/Services/ImageSource/FileImageSourceServiceTests.Android.cs
new file mode 100644
index 000000000000..b27c3a53c772
--- /dev/null
+++ b/src/Core/tests/DeviceTests/Services/ImageSource/FileImageSourceServiceTests.Android.cs
@@ -0,0 +1,67 @@
+using System;
+using System.Threading.Tasks;
+using Android.Graphics.Drawables;
+using Microsoft.Maui.DeviceTests.Stubs;
+using Xunit;
+using Color = Microsoft.Maui.Graphics.Color;
+
+namespace Microsoft.Maui.DeviceTests
+{
+	public partial class FileImageSourceServiceTests
+	{
+		[Theory]
+		[InlineData(typeof(FontImageSourceStub))]
+		[InlineData(typeof(StreamImageSourceStub))]
+		[InlineData(typeof(UriImageSourceStub))]
+		public async Task ThrowsForIncorrectTypes(Type type)
+		{
+			var service = new FileImageSourceService();
+
+			var imageSource = (ImageSourceStub)Activator.CreateInstance(type);
+
+			await Assert.ThrowsAsync<InvalidCastException>(() => service.GetDrawableAsync(imageSource, Platform.DefaultContext));
+		}
+
+		[Theory]
+		[InlineData("red.png", "#FF0000")]
+		[InlineData("green.png", "#00FF00")]
+		[InlineData("black.png", "#000000")]
+		public async Task GetDrawableAsyncWithResource(string filename, string colorHex)
+		{
+			var service = new FileImageSourceService();
+
+			var imageSource = new FileImageSourceStub(filename);
+
+			using var drawable = await service.GetDrawableAsync(imageSource, Platform.DefaultContext);
+
+			var bitmapDrawable = Assert.IsType<BitmapDrawable>(drawable.Value);
+
+			var bitmap = bitmapDrawable.Bitmap;
+
+			var expectedColor = Color.FromHex(colorHex);
+			bitmap.AssertColorAtCenter(expectedColor.ToNative());
+		}
+
+		[Theory]
+		[InlineData("#FF0000")]
+		[InlineData("#00FF00")]
+		[InlineData("#000000")]
+		public async Task GetDrawableAsyncWithFile(string colorHex)
+		{
+			var expectedColor = Color.FromHex(colorHex);
+
+			var service = new FileImageSourceService();
+
+			var filename = CreateBitmapFile(100, 100, expectedColor);
+			var imageSource = new FileImageSourceStub(filename);
+
+			using var drawable = await service.GetDrawableAsync(imageSource, Platform.DefaultContext);
+
+			var bitmapDrawable = Assert.IsType<BitmapDrawable>(drawable.Value);
+
+			var bitmap = bitmapDrawable.Bitmap;
+
+			bitmap.AssertColorAtCenter(expectedColor.ToNative());
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Services/ImageSource/FileImageSourceServiceTests.cs b/src/Core/tests/DeviceTests/Services/ImageSource/FileImageSourceServiceTests.cs
new file mode 100644
index 000000000000..d868e95ee864
--- /dev/null
+++ b/src/Core/tests/DeviceTests/Services/ImageSource/FileImageSourceServiceTests.cs
@@ -0,0 +1,7 @@
+namespace Microsoft.Maui.DeviceTests
+{
+	[Category(TestCategory.ImageSource)]
+	public partial class FileImageSourceServiceTests : BaseImageSourceServiceTests
+	{
+	}
+}
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Services/ImageSource/FileImageSourceServiceTests.iOS.cs b/src/Core/tests/DeviceTests/Services/ImageSource/FileImageSourceServiceTests.iOS.cs
new file mode 100644
index 000000000000..661f03ca59ca
--- /dev/null
+++ b/src/Core/tests/DeviceTests/Services/ImageSource/FileImageSourceServiceTests.iOS.cs
@@ -0,0 +1,63 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.Maui.DeviceTests.Stubs;
+using Microsoft.Maui.Graphics;
+using UIKit;
+using Xunit;
+
+namespace Microsoft.Maui.DeviceTests
+{
+	public partial class FileImageSourceServiceTests
+	{
+		[Theory]
+		[InlineData(typeof(FontImageSourceStub))]
+		[InlineData(typeof(StreamImageSourceStub))]
+		[InlineData(typeof(UriImageSourceStub))]
+		public async Task ThrowsForIncorrectTypes(Type type)
+		{
+			var service = new FileImageSourceService();
+
+			var imageSource = (ImageSourceStub)Activator.CreateInstance(type);
+
+			await Assert.ThrowsAsync<InvalidCastException>(() => service.GetImageAsync(imageSource));
+		}
+
+		[Theory]
+		[InlineData("red.png", "#FF0000")]
+		[InlineData("green.png", "#00FF00")]
+		[InlineData("black.png", "#000000")]
+		public async Task GetImageAsyncWithResource(string filename, string colorHex)
+		{
+			var service = new FileImageSourceService();
+
+			var imageSource = new FileImageSourceStub(filename);
+
+			using var result = await service.GetImageAsync(imageSource);
+
+			var uiimage = Assert.IsType<UIImage>(result.Value);
+
+			var expectedColor = Color.FromHex(colorHex);
+			uiimage.AssertColorAtCenter(expectedColor.ToNative());
+		}
+
+		[Theory]
+		[InlineData("#FF0000")]
+		[InlineData("#00FF00")]
+		[InlineData("#000000")]
+		public async Task GetImageAsyncWithFile(string colorHex)
+		{
+			var expectedColor = Color.FromHex(colorHex);
+
+			var service = new FileImageSourceService();
+
+			var filename = CreateBitmapFile(100, 100, expectedColor);
+			var imageSource = new FileImageSourceStub(filename);
+
+			using var drawable = await service.GetImageAsync(imageSource);
+
+			var uiimage = Assert.IsType<UIImage>(drawable.Value);
+
+			uiimage.AssertColorAtCenter(expectedColor.ToNative());
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Services/ImageSource/FontImageSourceServiceTests.Android.cs b/src/Core/tests/DeviceTests/Services/ImageSource/FontImageSourceServiceTests.Android.cs
new file mode 100644
index 000000000000..f299f5ad3421
--- /dev/null
+++ b/src/Core/tests/DeviceTests/Services/ImageSource/FontImageSourceServiceTests.Android.cs
@@ -0,0 +1,89 @@
+using System;
+using System.Threading.Tasks;
+using Android.Graphics.Drawables;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Maui.DeviceTests.Stubs;
+using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Hosting;
+using Xunit;
+
+namespace Microsoft.Maui.DeviceTests
+{
+	public partial class FontImageSourceServiceTests
+	{
+		[Theory]
+		[InlineData(typeof(FileImageSourceStub))]
+		[InlineData(typeof(StreamImageSourceStub))]
+		[InlineData(typeof(UriImageSourceStub))]
+		public async Task ThrowsForIncorrectTypes(Type type)
+		{
+			var service = new FontImageSourceService(null);
+
+			var imageSource = (ImageSourceStub)Activator.CreateInstance(type);
+
+			await Assert.ThrowsAsync<InvalidCastException>(() => service.GetDrawableAsync(imageSource, Platform.DefaultContext));
+		}
+
+		[Theory]
+		[InlineData("#FF0000")]
+		[InlineData("#00FF00")]
+		[InlineData("#000000")]
+		public async Task GetDrawableAsync(string colorHex)
+		{
+			var expectedColor = Color.FromHex(colorHex);
+
+			var host = new AppHostBuilder()
+				.ConfigureFonts()
+				.ConfigureImageSources()
+				.Build();
+
+			var images = host.Services.GetRequiredService<IImageSourceServiceProvider>();
+			var service = images.GetRequiredImageSourceService<FontImageSourceStub>();
+
+			var imageSource = new FontImageSourceStub
+			{
+				Glyph = "X",
+				Font = Font.Default,
+				Color = expectedColor,
+			};
+
+			using var drawable = await service.GetDrawableAsync(imageSource, Platform.DefaultContext);
+
+			var bitmapDrawable = Assert.IsType<BitmapDrawable>(drawable.Value);
+
+			var bitmap = bitmapDrawable.Bitmap;
+
+			bitmap.AssertContainsColor(expectedColor.ToNative());
+		}
+
+		[Fact]
+		public async Task GetDrawableAsyncWithCustomFont()
+		{
+			var host = new AppHostBuilder()
+				.ConfigureFonts(fonts =>
+				{
+					fonts.AddFont("dokdo_regular.ttf", "Dokdo");
+				})
+				.ConfigureImageSources()
+				.Build();
+
+			var images = host.Services.GetRequiredService<IImageSourceServiceProvider>();
+			var service = images.GetRequiredImageSourceService<FontImageSourceStub>();
+
+			var imageSource = new FontImageSourceStub
+			{
+				Glyph = "X",
+				Font = Font.OfSize("Dokdo", 24),
+				Color = Colors.Red,
+			};
+
+			using var drawable = await service.GetDrawableAsync(imageSource, Platform.DefaultContext);
+
+			var bitmapDrawable = Assert.IsType<BitmapDrawable>(drawable.Value);
+
+			var bitmap = bitmapDrawable.Bitmap;
+
+			bitmap.AssertContainsColor(Colors.Red.ToNative());
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Services/ImageSource/FontImageSourceServiceTests.cs b/src/Core/tests/DeviceTests/Services/ImageSource/FontImageSourceServiceTests.cs
new file mode 100644
index 000000000000..d6d196782356
--- /dev/null
+++ b/src/Core/tests/DeviceTests/Services/ImageSource/FontImageSourceServiceTests.cs
@@ -0,0 +1,7 @@
+namespace Microsoft.Maui.DeviceTests
+{
+	[Category(TestCategory.ImageSource)]
+	public partial class FontImageSourceServiceTests : BaseImageSourceServiceTests
+	{
+	}
+}
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Services/ImageSource/FontImageSourceServiceTests.iOS.cs b/src/Core/tests/DeviceTests/Services/ImageSource/FontImageSourceServiceTests.iOS.cs
new file mode 100644
index 000000000000..00ee3d274025
--- /dev/null
+++ b/src/Core/tests/DeviceTests/Services/ImageSource/FontImageSourceServiceTests.iOS.cs
@@ -0,0 +1,85 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Maui.DeviceTests.Stubs;
+using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Hosting;
+using UIKit;
+using Xunit;
+
+namespace Microsoft.Maui.DeviceTests
+{
+	public partial class FontImageSourceServiceTests
+	{
+		[Theory]
+		[InlineData(typeof(FileImageSourceStub))]
+		[InlineData(typeof(StreamImageSourceStub))]
+		[InlineData(typeof(UriImageSourceStub))]
+		public async Task ThrowsForIncorrectTypes(Type type)
+		{
+			var service = new FontImageSourceService(null);
+
+			var imageSource = (ImageSourceStub)Activator.CreateInstance(type);
+
+			await Assert.ThrowsAsync<InvalidCastException>(() => service.GetImageAsync(imageSource));
+		}
+
+		[Theory]
+		[InlineData("#FF0000")]
+		[InlineData("#00FF00")]
+		[InlineData("#000000")]
+		public async Task GetImageAsync(string colorHex)
+		{
+			var expectedColor = Color.FromHex(colorHex);
+
+			var host = new AppHostBuilder()
+				.ConfigureFonts()
+				.ConfigureImageSources()
+				.Build();
+
+			var images = host.Services.GetRequiredService<IImageSourceServiceProvider>();
+			var service = images.GetRequiredImageSourceService<FontImageSourceStub>();
+
+			var imageSource = new FontImageSourceStub
+			{
+				Glyph = "X",
+				Font = Font.Default.WithSize(30),
+				Color = expectedColor,
+			};
+
+			using var drawable = await InvokeOnMainThreadAsync(() => service.GetImageAsync(imageSource));
+
+			var uiimage = Assert.IsType<UIImage>(drawable.Value);
+
+			uiimage.AssertContainsColor(expectedColor.ToNative());
+		}
+
+		[Fact]
+		public async Task GetImageAsyncWithCustomFont()
+		{
+			var host = new AppHostBuilder()
+				.ConfigureFonts(fonts =>
+				{
+					fonts.AddFont("dokdo_regular.ttf", "Dokdo");
+				})
+				.ConfigureImageSources()
+				.Build();
+
+			var images = host.Services.GetRequiredService<IImageSourceServiceProvider>();
+			var service = images.GetRequiredImageSourceService<FontImageSourceStub>();
+
+			var imageSource = new FontImageSourceStub
+			{
+				Glyph = "X",
+				Font = Font.OfSize("Dokdo", 24),
+				Color = Colors.Red,
+			};
+
+			using var drawable = await InvokeOnMainThreadAsync(() => service.GetImageAsync(imageSource));
+
+			var uiimage = Assert.IsType<UIImage>(drawable.Value);
+
+			uiimage.AssertContainsColor(Colors.Red.ToNative());
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Services/ImageSource/ImageSourceServiceTests.Android.cs b/src/Core/tests/DeviceTests/Services/ImageSource/ImageSourceServiceTests.Android.cs
new file mode 100644
index 000000000000..c1d006db7440
--- /dev/null
+++ b/src/Core/tests/DeviceTests/Services/ImageSource/ImageSourceServiceTests.Android.cs
@@ -0,0 +1,172 @@
+using System;
+using System.Reflection;
+using System.Threading.Tasks;
+using Android.Graphics.Drawables;
+using Bumptech.Glide;
+using Bumptech.Glide.Load.Engine;
+using Java.Util.Concurrent;
+using Microsoft.Maui.BumptechGlide;
+using Microsoft.Maui.DeviceTests.Stubs;
+using Microsoft.Maui.Graphics;
+using Xunit;
+
+namespace Microsoft.Maui.DeviceTests
+{
+	public partial class ImageSourceServiceTests : BaseImageSourceServiceTests
+	{
+		const int GCCollectRetries = 100;
+
+		[Fact]
+		public async Task TheSameImageSourceReturnsTheSameBitmap()
+		{
+			var bitmapFile = CreateBitmapFile(100, 100, Colors.Red);
+			var imageSource = new FileImageSourceStub(bitmapFile);
+
+			var service = new FileImageSourceService();
+
+			// get an image
+			var result1 = await service.GetDrawableAsync(imageSource, Platform.DefaultContext);
+			var bitmapDrawable1 = Assert.IsType<BitmapDrawable>(result1.Value);
+			var bitmap1 = bitmapDrawable1.Bitmap;
+
+			// try collect it
+			var collected = await TryCollectFile(bitmapFile);
+			Assert.False(collected);
+
+			// get the image again
+			var result2 = await service.GetDrawableAsync(imageSource, Platform.DefaultContext);
+			var bitmapDrawable2 = Assert.IsType<BitmapDrawable>(result2.Value);
+			var bitmap2 = bitmapDrawable2.Bitmap;
+
+			// make sure it was NOT collected and we got the same image
+			Assert.Equal(bitmap1, bitmap2);
+
+			result1.Dispose();
+			result2.Dispose();
+		}
+
+		[Fact]
+		public async Task ReleasingImageSourceReturnsDifferentBitmap()
+		{
+			var bitmapFile = CreateBitmapFile(100, 100, Colors.Red);
+			var imageSource = new FileImageSourceStub(bitmapFile);
+
+			var service = new FileImageSourceService();
+
+			// get an image
+			var result1 = await service.GetDrawableAsync(imageSource, Platform.DefaultContext);
+			var bitmapDrawable1 = Assert.IsType<BitmapDrawable>(result1.Value);
+			var bitmap1 = bitmapDrawable1.Bitmap;
+
+			// release
+			result1.Dispose();
+
+			// try collect it
+			var collected = await TryCollectFile(bitmapFile);
+			Assert.True(collected);
+
+			// get the image again
+			var result2 = await service.GetDrawableAsync(imageSource, Platform.DefaultContext);
+			var bitmapDrawable2 = Assert.IsType<BitmapDrawable>(result2.Value);
+			var bitmap2 = bitmapDrawable2.Bitmap;
+
+			// make sure it WAS collected and we got a new image
+			Assert.NotEqual(bitmap1, bitmap2);
+
+			result2.Dispose();
+		}
+
+		[Fact]
+		public void GlideStaticEqualsGlideGet()
+		{
+			var fromGet = Glide.Get(Platform.DefaultContext);
+
+			var manager = Glide.With(Platform.DefaultContext);
+			var glideField = manager.GetType().GetProperty("Glide", BindingFlags.NonPublic | BindingFlags.Instance);
+			var fromField = glideField.GetValue(manager);
+
+			Assert.Equal(fromGet, fromField);
+		}
+
+		[Fact]
+		public async Task CustomTheSameImageSourceReturnsTheSameBitmap()
+		{
+			var imageSource = new CustomImageSourceStub(Colors.Red);
+
+			var cache = new CustomImageCacheStub();
+			var service = new CustomImageSourceServiceStub(cache);
+
+			// get an image
+			var result1 = await service.GetDrawableAsync(imageSource, Platform.DefaultContext);
+			Assert.Equal(1, cache.Cache.Count);
+			Assert.Equal(1, cache.Cache[imageSource.Color].Count);
+
+			// get the image again
+			var result2 = await service.GetDrawableAsync(imageSource, Platform.DefaultContext);
+			Assert.Equal(1, cache.Cache.Count);
+			Assert.Equal(2, cache.Cache[imageSource.Color].Count);
+
+			// make sure it was NOT collected and we got the same image
+			Assert.Equal(result1.Value, result2.Value);
+
+			result1.Dispose();
+			result2.Dispose();
+		}
+
+		[Fact]
+		public async Task CustomReleasingImageSourceReturnsDifferentBitmap()
+		{
+			var imageSource = new CustomImageSourceStub(Colors.Red);
+
+			var cache = new CustomImageCacheStub();
+			var service = new CustomImageSourceServiceStub(cache);
+
+			// get an image
+			var result1 = await service.GetDrawableAsync(imageSource, Platform.DefaultContext);
+			Assert.Equal(1, cache.Cache.Count);
+			Assert.Equal(1, cache.Cache[imageSource.Color].Count);
+
+			// release
+			result1.Dispose();
+
+			// get the image again
+			var result2 = await service.GetDrawableAsync(imageSource, Platform.DefaultContext);
+			Assert.Equal(1, cache.Cache.Count);
+			Assert.Equal(1, cache.Cache[imageSource.Color].Count);
+
+			// make sure it WAS collected and we got a new image
+			Assert.NotEqual(result1.Value, result2.Value);
+
+			result2.Dispose();
+		}
+
+		static async Task<bool> TryCollectFile(string bitmapFile)
+		{
+			var collected = false;
+
+			for (var i = 0; i < GCCollectRetries; i++)
+			{
+				GC.Collect();
+
+				try
+				{
+					// the OnlyRetrieveFromCache means that if it is not already loaded, then throw
+					await Glide
+						.With(Platform.DefaultContext)
+						.Load(bitmapFile, Platform.DefaultContext)
+						.SetOnlyRetrieveFromCache(true)
+						.SetDiskCacheStrategy(DiskCacheStrategy.None)
+						.Submit()
+						.AsTask();
+				}
+				catch (ExecutionException ex) when (ex.Cause is GlideException)
+				{
+					// no-op becasue we are waiting for this
+					collected = true;
+				}
+			}
+
+			return collected;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Services/ImageSource/ImageSourceServiceTests.cs b/src/Core/tests/DeviceTests/Services/ImageSource/ImageSourceServiceTests.cs
new file mode 100644
index 000000000000..89147fa86a6a
--- /dev/null
+++ b/src/Core/tests/DeviceTests/Services/ImageSource/ImageSourceServiceTests.cs
@@ -0,0 +1,104 @@
+using System;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Maui.DeviceTests.Stubs;
+using Microsoft.Maui.Graphics;
+using Microsoft.Maui.Hosting;
+using Xunit;
+
+namespace Microsoft.Maui.DeviceTests
+{
+	public partial class ImageSourceServiceTests : BaseImageSourceServiceTests
+	{
+		[Fact]
+		public void CanResolveCorrectService()
+		{
+			var provider = CreateImageSourceServiceProvider(services =>
+			{
+				services.AddService<IFileImageSource, FileImageSourceService>();
+			});
+
+			var imageSource = new FileImageSourceStub();
+
+			var service = provider.GetRequiredImageSourceService(imageSource);
+
+			Assert.IsType<FileImageSourceService>(service);
+		}
+
+		[Fact]
+		public void CanResolveCorrectServiceWhenMultiple()
+		{
+			var provider = CreateImageSourceServiceProvider(services =>
+			{
+				services.AddService<IFileImageSource, FileImageSourceService>();
+				services.AddService<IUriImageSource, UriImageSourceService>();
+			});
+
+			var service = provider.GetRequiredImageSourceService(new FileImageSourceStub());
+			Assert.IsType<FileImageSourceService>(service);
+
+			service = provider.GetRequiredImageSourceService(new UriImageSourceStub());
+			Assert.IsType<UriImageSourceService>(service);
+		}
+
+		[Fact]
+		public void ThrowsWhenMissingService()
+		{
+			var provider = CreateImageSourceServiceProvider(services => { });
+
+			var ex = Assert.Throws<InvalidOperationException>(() => provider.GetRequiredImageSourceService(new FileImageSourceStub()));
+
+			Assert.Contains(nameof(IFileImageSource), ex.Message);
+		}
+
+		[Fact]
+		public void ThrowsWhenNotASpecificImageSource()
+		{
+			var provider = CreateImageSourceServiceProvider(services => { });
+
+			var ex = Assert.Throws<InvalidOperationException>(() => provider.GetRequiredImageSourceService(new InvalidImageSourceStub()));
+
+			Assert.Contains(nameof(InvalidImageSourceStub), ex.Message);
+			Assert.Contains(nameof(IImageSource), ex.Message);
+		}
+
+		[Fact]
+		public void ResultsDisposeCorrectlyAndOnce()
+		{
+			var dispose = 0;
+
+			var cache = new CustomImageCacheStub();
+			var image = cache.Get(Colors.Red);
+
+			var result = new ImageSourceServiceResult(image, () => dispose++);
+
+			Assert.False(result.IsDisposed);
+			Assert.Equal(0, dispose);
+
+			result.Dispose();
+
+			Assert.True(result.IsDisposed);
+			Assert.Equal(1, dispose);
+
+			result.Dispose();
+
+			Assert.True(result.IsDisposed);
+			Assert.Equal(1, dispose);
+
+			cache.Return(Colors.Red);
+		}
+
+		private IImageSourceServiceProvider CreateImageSourceServiceProvider(Action<IImageSourceServiceCollection> configure)
+		{
+			var host = new AppHostBuilder()
+				.UseMauiServiceProviderFactory(true)
+				.ConfigureImageSources(configure)
+				.Build();
+
+			var services = host.Services;
+
+			var provider = services.GetRequiredService<IImageSourceServiceProvider>();
+
+			return provider;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Services/ImageSource/ImageSourceServiceTests.iOS.cs b/src/Core/tests/DeviceTests/Services/ImageSource/ImageSourceServiceTests.iOS.cs
new file mode 100644
index 000000000000..1c99d353f3d8
--- /dev/null
+++ b/src/Core/tests/DeviceTests/Services/ImageSource/ImageSourceServiceTests.iOS.cs
@@ -0,0 +1,139 @@
+using System;
+using System.Reflection;
+using System.Threading.Tasks;
+using Microsoft.Maui.DeviceTests.Stubs;
+using Microsoft.Maui.Graphics;
+using UIKit;
+using Xunit;
+
+namespace Microsoft.Maui.DeviceTests
+{
+	public partial class ImageSourceServiceTests : BaseImageSourceServiceTests
+	{
+		const int GCCollectRetries = 100;
+
+		// TODO: implement a "native" caching system everywhere on ios and update this
+		[Fact(Skip = "iOS has no caching mechanism yet")]
+		public async Task TheSameImageSourceReturnsTheSameBitmap()
+		{
+			var bitmapFile = CreateBitmapFile(100, 100, Colors.Red);
+			var imageSource = new FileImageSourceStub(bitmapFile);
+
+			var service = new FileImageSourceService();
+
+			// get an image
+			var result1 = await service.GetImageAsync(imageSource);
+			var uiimage1 = Assert.IsType<UIImage>(result1.Value);
+
+			// try collect it
+			var collected = await TryCollectFile(bitmapFile);
+			Assert.False(collected);
+
+			// get the image again
+			var result2 = await service.GetImageAsync(imageSource);
+			var uiimage2 = Assert.IsType<UIImage>(result2.Value);
+
+			// make sure it was NOT collected and we got the same image
+			Assert.Equal(uiimage1, uiimage2);
+
+			result1.Dispose();
+			result2.Dispose();
+		}
+
+		// TODO: implement a "native" caching system everywhere on ios and update this
+		[Fact(Skip = "iOS has no caching mechanism yet")]
+		public async Task ReleasingImageSourceReturnsDifferentBitmap()
+		{
+			var bitmapFile = CreateBitmapFile(100, 100, Colors.Red);
+			var imageSource = new FileImageSourceStub(bitmapFile);
+
+			var service = new FileImageSourceService();
+
+			// get an image
+			var result1 = await service.GetImageAsync(imageSource);
+			var uiimage1 = Assert.IsType<UIImage>(result1.Value);
+
+			// release
+			result1.Dispose();
+
+			// try collect it
+			var collected = await TryCollectFile(bitmapFile);
+			Assert.True(collected);
+
+			// get the image again
+			var result2 = await service.GetImageAsync(imageSource);
+			var uiimage2 = Assert.IsType<UIImage>(result2.Value);
+
+			// make sure it WAS collected and we got a new image
+			Assert.NotEqual(uiimage1, uiimage2);
+
+			result2.Dispose();
+		}
+
+		[Fact]
+		public async Task CustomTheSameImageSourceReturnsTheSameBitmap()
+		{
+			var imageSource = new CustomImageSourceStub(Colors.Red);
+
+			var cache = new CustomImageCacheStub();
+			var service = new CustomImageSourceServiceStub(cache);
+
+			// get an image
+			var result1 = await service.GetImageAsync(imageSource);
+			Assert.Equal(1, cache.Cache.Count);
+			Assert.Equal(1, cache.Cache[imageSource.Color].Count);
+
+			// get the image again
+			var result2 = await service.GetImageAsync(imageSource);
+			Assert.Equal(1, cache.Cache.Count);
+			Assert.Equal(2, cache.Cache[imageSource.Color].Count);
+
+			// make sure it was NOT collected and we got the same image
+			Assert.Equal(result1.Value, result2.Value);
+
+			result1.Dispose();
+			result2.Dispose();
+		}
+
+		[Fact]
+		public async Task CustomReleasingImageSourceReturnsDifferentBitmap()
+		{
+			var imageSource = new CustomImageSourceStub(Colors.Red);
+
+			var cache = new CustomImageCacheStub();
+			var service = new CustomImageSourceServiceStub(cache);
+
+			// get an image
+			var result1 = await service.GetImageAsync(imageSource);
+			Assert.Equal(1, cache.Cache.Count);
+			Assert.Equal(1, cache.Cache[imageSource.Color].Count);
+
+			// release
+			result1.Dispose();
+
+			// get the image again
+			var result2 = await service.GetImageAsync(imageSource);
+			Assert.Equal(1, cache.Cache.Count);
+			Assert.Equal(1, cache.Cache[imageSource.Color].Count);
+
+			// make sure it WAS collected and we got a new image
+			Assert.NotEqual(result1.Value, result2.Value);
+
+			result2.Dispose();
+		}
+
+		static Task<bool> TryCollectFile(string bitmapFile)
+		{
+			var collected = false;
+
+			for (var i = 0; i < GCCollectRetries; i++)
+			{
+				GC.Collect();
+
+				// TODO: implement a "native" caching system everywhere on ios and update this
+			}
+
+			return Task.FromResult(collected);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Services/ImageSource/StreamImageSourceServiceTests.Android.cs b/src/Core/tests/DeviceTests/Services/ImageSource/StreamImageSourceServiceTests.Android.cs
new file mode 100644
index 000000000000..2a7e2590f2ef
--- /dev/null
+++ b/src/Core/tests/DeviceTests/Services/ImageSource/StreamImageSourceServiceTests.Android.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Threading.Tasks;
+using Android.Graphics.Drawables;
+using Microsoft.Maui.DeviceTests.Stubs;
+using Xunit;
+using Color = Microsoft.Maui.Graphics.Color;
+
+namespace Microsoft.Maui.DeviceTests
+{
+	public partial class StreamImageSourceServiceTests
+	{
+		[Theory]
+		[InlineData(typeof(FileImageSourceStub))]
+		[InlineData(typeof(FontImageSourceStub))]
+		[InlineData(typeof(UriImageSourceStub))]
+		public async Task ThrowsForIncorrectTypes(Type type)
+		{
+			var service = new StreamImageSourceService();
+
+			var imageSource = (ImageSourceStub)Activator.CreateInstance(type);
+
+			await Assert.ThrowsAsync<InvalidCastException>(() => service.GetDrawableAsync(imageSource, Platform.DefaultContext));
+		}
+
+		[Theory]
+		[InlineData("#FF0000")]
+		[InlineData("#00FF00")]
+		[InlineData("#000000")]
+		public async Task GetDrawableAsync(string colorHex)
+		{
+			var expectedColor = Color.FromHex(colorHex).ToNative();
+
+			var service = new StreamImageSourceService();
+
+			var imageSource = new StreamImageSourceStub(CreateBitmapStream(100, 100, expectedColor));
+
+			using var drawable = await service.GetDrawableAsync(imageSource, Platform.DefaultContext);
+
+			var bitmapDrawable = Assert.IsType<BitmapDrawable>(drawable.Value);
+
+			var bitmap = bitmapDrawable.Bitmap;
+
+			bitmap.AssertColorAtCenter(expectedColor);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Services/ImageSource/StreamImageSourceServiceTests.cs b/src/Core/tests/DeviceTests/Services/ImageSource/StreamImageSourceServiceTests.cs
new file mode 100644
index 000000000000..1d2f4f95058b
--- /dev/null
+++ b/src/Core/tests/DeviceTests/Services/ImageSource/StreamImageSourceServiceTests.cs
@@ -0,0 +1,7 @@
+namespace Microsoft.Maui.DeviceTests
+{
+	[Category(TestCategory.ImageSource)]
+	public partial class StreamImageSourceServiceTests : BaseImageSourceServiceTests
+	{
+	}
+}
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Services/ImageSource/StreamImageSourceServiceTests.iOS.cs b/src/Core/tests/DeviceTests/Services/ImageSource/StreamImageSourceServiceTests.iOS.cs
new file mode 100644
index 000000000000..827fcb497871
--- /dev/null
+++ b/src/Core/tests/DeviceTests/Services/ImageSource/StreamImageSourceServiceTests.iOS.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.Maui.DeviceTests.Stubs;
+using Microsoft.Maui.Graphics;
+using UIKit;
+using Xunit;
+
+namespace Microsoft.Maui.DeviceTests
+{
+	public partial class StreamImageSourceServiceTests
+	{
+		[Theory]
+		[InlineData(typeof(FileImageSourceStub))]
+		[InlineData(typeof(FontImageSourceStub))]
+		[InlineData(typeof(UriImageSourceStub))]
+		public async Task ThrowsForIncorrectTypes(Type type)
+		{
+			var service = new StreamImageSourceService();
+
+			var imageSource = (ImageSourceStub)Activator.CreateInstance(type);
+
+			await Assert.ThrowsAsync<InvalidCastException>(() => service.GetImageAsync(imageSource));
+		}
+
+		[Theory]
+		[InlineData("#FF0000")]
+		[InlineData("#00FF00")]
+		[InlineData("#000000")]
+		public async Task GetImageAsync(string colorHex)
+		{
+			var expectedColor = Color.FromHex(colorHex).ToNative();
+
+			var service = new StreamImageSourceService();
+
+			var imageSource = new StreamImageSourceStub(CreateBitmapStream(100, 100, expectedColor));
+
+			using var drawable = await service.GetImageAsync(imageSource);
+
+			var image = Assert.IsType<UIImage>(drawable.Value);
+
+			image.AssertColorAtCenter(expectedColor);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Services/ImageSource/UriImageSourceServiceTests.Android.cs b/src/Core/tests/DeviceTests/Services/ImageSource/UriImageSourceServiceTests.Android.cs
new file mode 100644
index 000000000000..0e8e872e38dd
--- /dev/null
+++ b/src/Core/tests/DeviceTests/Services/ImageSource/UriImageSourceServiceTests.Android.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.Maui.DeviceTests.Stubs;
+using Xunit;
+
+namespace Microsoft.Maui.DeviceTests
+{
+	public partial class UriImageSourceServiceTests
+	{
+		[Theory]
+		[InlineData(typeof(FileImageSourceStub))]
+		[InlineData(typeof(FontImageSourceStub))]
+		[InlineData(typeof(StreamImageSourceStub))]
+		public async Task ThrowsForIncorrectTypes(Type type)
+		{
+			var service = new UriImageSourceService();
+
+			var imageSource = (ImageSourceStub)Activator.CreateInstance(type);
+
+			await Assert.ThrowsAsync<InvalidCastException>(() => service.GetDrawableAsync(imageSource, Platform.DefaultContext));
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Services/ImageSource/UriImageSourceServiceTests.cs b/src/Core/tests/DeviceTests/Services/ImageSource/UriImageSourceServiceTests.cs
new file mode 100644
index 000000000000..234f77cbf085
--- /dev/null
+++ b/src/Core/tests/DeviceTests/Services/ImageSource/UriImageSourceServiceTests.cs
@@ -0,0 +1,7 @@
+namespace Microsoft.Maui.DeviceTests
+{
+	[Category(TestCategory.ImageSource)]
+	public partial class UriImageSourceServiceTests : BaseImageSourceServiceTests
+	{
+	}
+}
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Services/ImageSource/UriImageSourceServiceTests.iOS.cs b/src/Core/tests/DeviceTests/Services/ImageSource/UriImageSourceServiceTests.iOS.cs
new file mode 100644
index 000000000000..c36535c281fd
--- /dev/null
+++ b/src/Core/tests/DeviceTests/Services/ImageSource/UriImageSourceServiceTests.iOS.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.Maui.DeviceTests.Stubs;
+using Xunit;
+
+namespace Microsoft.Maui.DeviceTests
+{
+	public partial class UriImageSourceServiceTests
+	{
+		[Theory]
+		[InlineData(typeof(FileImageSourceStub))]
+		[InlineData(typeof(FontImageSourceStub))]
+		[InlineData(typeof(StreamImageSourceStub))]
+		public async Task ThrowsForIncorrectTypes(Type type)
+		{
+			var service = new UriImageSourceService();
+
+			var imageSource = (ImageSourceStub)Activator.CreateInstance(type);
+
+			await Assert.ThrowsAsync<InvalidCastException>(() => service.GetImageAsync(imageSource));
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Stubs/ApplicationStub.cs b/src/Core/tests/DeviceTests/Stubs/ApplicationStub.cs
index 24cdbf26de83..9c6ed70875b7 100644
--- a/src/Core/tests/DeviceTests/Stubs/ApplicationStub.cs
+++ b/src/Core/tests/DeviceTests/Stubs/ApplicationStub.cs
@@ -1,10 +1,17 @@
+using System.Collections.Generic;
+
 namespace Microsoft.Maui.DeviceTests.Stubs
 {
 	class ApplicationStub : IApplication
 	{
-		public IWindow CreateWindow(IActivationState activationState)
+		List<IWindow> _windows = new List<IWindow>();
+		public IReadOnlyList<IWindow> Windows => _windows.AsReadOnly();
+
+		public IWindow CreateWindow(IActivationState state)
 		{
-			return new WindowStub();
+			_windows.Add(new WindowStub());
+
+			return _windows[0];
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Stubs/CountedImageHandler.Android.cs b/src/Core/tests/DeviceTests/Stubs/CountedImageHandler.Android.cs
new file mode 100644
index 000000000000..6301f59bc9ea
--- /dev/null
+++ b/src/Core/tests/DeviceTests/Stubs/CountedImageHandler.Android.cs
@@ -0,0 +1,61 @@
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using Android.Content;
+using Android.Graphics;
+using Android.Graphics.Drawables;
+using AImageView = Android.Widget.ImageView;
+
+namespace Microsoft.Maui.DeviceTests.Stubs
+{
+	public partial class CountedImageHandler
+	{
+		protected override AImageView CreateNativeView() => new CountedImageView(Context);
+
+		public List<(string Member, object Value)> ImageEvents => ((CountedImageView)NativeView).ImageEvents;
+
+		public class CountedImageView : AImageView
+		{
+			public CountedImageView(Context context)
+				: base(context)
+			{
+			}
+
+			public List<(string, object)> ImageEvents { get; } = new List<(string, object)>();
+
+			public override void SetImageBitmap(Bitmap bm)
+			{
+				base.SetImageBitmap(bm);
+				Log(bm);
+			}
+
+			public override void SetImageDrawable(Drawable drawable)
+			{
+				base.SetImageDrawable(drawable);
+				Log(drawable);
+			}
+
+			public override void SetImageIcon(Icon icon)
+			{
+				base.SetImageIcon(icon);
+				Log(icon);
+			}
+
+			public override void SetImageResource(int resId)
+			{
+				base.SetImageResource(resId);
+				Log(resId);
+			}
+
+			public override void SetImageURI(Android.Net.Uri uri)
+			{
+				base.SetImageURI(uri);
+				Log(uri);
+			}
+
+			void Log(object value, [CallerMemberName] string member = null)
+			{
+				ImageEvents.Add((member, value));
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Stubs/CountedImageHandler.cs b/src/Core/tests/DeviceTests/Stubs/CountedImageHandler.cs
new file mode 100644
index 000000000000..371c9e4d599b
--- /dev/null
+++ b/src/Core/tests/DeviceTests/Stubs/CountedImageHandler.cs
@@ -0,0 +1,8 @@
+using Microsoft.Maui.Handlers;
+
+namespace Microsoft.Maui.DeviceTests.Stubs
+{
+	public partial class CountedImageHandler : ImageHandler
+	{
+	}
+}
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Stubs/CountedImageHandler.iOS.cs b/src/Core/tests/DeviceTests/Stubs/CountedImageHandler.iOS.cs
new file mode 100644
index 000000000000..b9e7824e9478
--- /dev/null
+++ b/src/Core/tests/DeviceTests/Stubs/CountedImageHandler.iOS.cs
@@ -0,0 +1,33 @@
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using UIKit;
+
+namespace Microsoft.Maui.DeviceTests.Stubs
+{
+	public partial class CountedImageHandler
+	{
+		protected override UIImageView CreateNativeView() => new CountedImageView();
+
+		public List<(string Member, object Value)> ImageEvents => ((CountedImageView)NativeView).ImageEvents;
+
+		public class CountedImageView : UIImageView
+		{
+			public List<(string, object)> ImageEvents { get; } = new List<(string, object)>();
+
+			public override UIImage Image
+			{
+				get => base.Image;
+				set
+				{
+					base.Image = value;
+					Log(value);
+				}
+			}
+
+			void Log(object value, [CallerMemberName] string member = null)
+			{
+				ImageEvents.Add((member, value));
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Stubs/CountedImageSourceServiceStub.Android.cs b/src/Core/tests/DeviceTests/Stubs/CountedImageSourceServiceStub.Android.cs
new file mode 100644
index 000000000000..6d81979c22c0
--- /dev/null
+++ b/src/Core/tests/DeviceTests/Stubs/CountedImageSourceServiceStub.Android.cs
@@ -0,0 +1,46 @@
+using System.Threading;
+using System.Threading.Tasks;
+using Android.Content;
+using Android.Graphics.Drawables;
+
+namespace Microsoft.Maui.DeviceTests.Stubs
+{
+	public partial class CountedImageSourceServiceStub
+	{
+		public Task<IImageSourceServiceResult<Drawable>> GetDrawableAsync(IImageSource imageSource, Context context, CancellationToken cancellationToken = default) =>
+			GetDrawableAsync((ICountedImageSourceStub)imageSource, context, cancellationToken);
+
+		public async Task<IImageSourceServiceResult<Drawable>> GetDrawableAsync(ICountedImageSourceStub imageSource, Context context, CancellationToken cancellationToken = default)
+		{
+			try
+			{
+				Starting.Set();
+
+				// simulate actual work
+				var drawable = await Task.Run(() =>
+				{
+					if (imageSource.Wait)
+						DoWork.WaitOne();
+
+					var color = imageSource.Color.ToNative();
+
+					return new ColorDrawable(color);
+				}).ConfigureAwait(false);
+
+				return new Result(drawable, imageSource.IsResolutionDependent);
+			}
+			finally
+			{
+				Finishing.Set();
+			}
+		}
+
+		class Result : ImageSourceServiceResult
+		{
+			public Result(ColorDrawable drawable, bool resolutionDependent)
+				: base(drawable, resolutionDependent, () => drawable.Dispose())
+			{
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Stubs/CountedImageSourceServiceStub.cs b/src/Core/tests/DeviceTests/Stubs/CountedImageSourceServiceStub.cs
new file mode 100644
index 000000000000..6e1f43f7d7ef
--- /dev/null
+++ b/src/Core/tests/DeviceTests/Stubs/CountedImageSourceServiceStub.cs
@@ -0,0 +1,22 @@
+using System.Threading;
+
+namespace Microsoft.Maui.DeviceTests.Stubs
+{
+	public partial class CountedImageSourceServiceStub : IImageSourceService<ICountedImageSourceStub>
+	{
+		/// <summary>
+		/// The service is wanting to start.
+		/// </summary>
+		public AutoResetEvent Starting { get; } = new AutoResetEvent(false);
+
+		/// <summary>
+		/// Used to indicate that the service is permitted to actually start.
+		/// </summary>
+		public AutoResetEvent DoWork { get; } = new AutoResetEvent(false);
+
+		/// <summary>
+		/// The service is finished and about to return.
+		/// </summary>
+		public AutoResetEvent Finishing { get; } = new AutoResetEvent(false);
+	}
+}
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Stubs/CountedImageSourceServiceStub.iOS.cs b/src/Core/tests/DeviceTests/Stubs/CountedImageSourceServiceStub.iOS.cs
new file mode 100644
index 000000000000..21e85a023121
--- /dev/null
+++ b/src/Core/tests/DeviceTests/Stubs/CountedImageSourceServiceStub.iOS.cs
@@ -0,0 +1,63 @@
+using System.Threading;
+using System.Threading.Tasks;
+using CoreGraphics;
+using UIKit;
+
+namespace Microsoft.Maui.DeviceTests.Stubs
+{
+	public partial class CountedImageSourceServiceStub
+	{
+		public Task<IImageSourceServiceResult<UIImage>> GetImageAsync(IImageSource imageSource, float scale = 1, CancellationToken cancellationToken = default) =>
+			GetImageAsync((ICountedImageSourceStub)imageSource, scale, cancellationToken);
+
+		public async Task<IImageSourceServiceResult<UIImage>> GetImageAsync(ICountedImageSourceStub imageSource, float scale = 1, CancellationToken cancellationToken = default)
+		{
+			try
+			{
+				Starting.Set();
+
+				// simulate actual work
+				var image = await Task.Run(() =>
+				{
+					if (imageSource.Wait)
+						DoWork.WaitOne();
+
+					var color = imageSource.Color.ToNative();
+
+					return CreateImage(scale, color);
+				}).ConfigureAwait(false);
+
+				return new Result(image, imageSource.IsResolutionDependent);
+			}
+			finally
+			{
+				Finishing.Set();
+			}
+		}
+
+		static UIImage CreateImage(float scale, UIColor color)
+		{
+			var rect = new CGRect(0, 0, 100, 100);
+
+			UIGraphics.BeginImageContextWithOptions(rect.Size, false, scale);
+			var context = UIGraphics.GetCurrentContext();
+
+			color.SetFill();
+			context.FillRect(rect);
+
+			var image = UIGraphics.GetImageFromCurrentImageContext();
+
+			UIGraphics.EndImageContext();
+
+			return image.ImageWithRenderingMode(UIImageRenderingMode.AlwaysOriginal);
+		}
+
+		class Result : ImageSourceServiceResult
+		{
+			public Result(UIImage image, bool resolutionDependent)
+				: base(image, resolutionDependent, () => image.Dispose())
+			{
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Stubs/CountedImageSourceStub.cs b/src/Core/tests/DeviceTests/Stubs/CountedImageSourceStub.cs
new file mode 100644
index 000000000000..7a799bcfc007
--- /dev/null
+++ b/src/Core/tests/DeviceTests/Stubs/CountedImageSourceStub.cs
@@ -0,0 +1,32 @@
+using Microsoft.Maui.Graphics;
+
+namespace Microsoft.Maui.DeviceTests.Stubs
+{
+	public interface ICountedImageSourceStub : IImageSource
+	{
+		bool Wait { get; }
+
+		bool IsResolutionDependent { get; }
+
+		Color Color { get; }
+	}
+
+	public partial class CountedImageSourceStub : ImageSourceStub, ICountedImageSourceStub
+	{
+		public CountedImageSourceStub()
+		{
+		}
+
+		public CountedImageSourceStub(Color color, bool wait = false)
+		{
+			Color = color;
+			Wait = wait;
+		}
+
+		public bool Wait { get; set; } = false;
+
+		public bool IsResolutionDependent { get; set; } = false;
+
+		public Color Color { get; set; }
+	}
+}
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Stubs/CustomImageCacheStub.Android.cs b/src/Core/tests/DeviceTests/Stubs/CustomImageCacheStub.Android.cs
new file mode 100644
index 000000000000..3858f6aed4fd
--- /dev/null
+++ b/src/Core/tests/DeviceTests/Stubs/CustomImageCacheStub.Android.cs
@@ -0,0 +1,37 @@
+using System.Collections.Generic;
+using Android.Graphics.Drawables;
+using Microsoft.Maui.Graphics;
+
+namespace Microsoft.Maui.DeviceTests.Stubs
+{
+	class CustomImageCacheStub
+	{
+		readonly Dictionary<Color, (ColorDrawable Drawable, int Count)> _cache = new Dictionary<Color, (ColorDrawable, int)>();
+
+		public IReadOnlyDictionary<Color, (ColorDrawable Drawable, int Count)> Cache => _cache;
+
+		public ColorDrawable Get(Color color)
+		{
+			if (_cache.TryGetValue(color, out var cacheItem))
+			{
+				_cache[color] = (cacheItem.Drawable, cacheItem.Count + 1);
+				return cacheItem.Drawable;
+			}
+
+			var drawable = new ColorDrawable(color.ToNative());
+			_cache[color] = (drawable, 1);
+			return drawable;
+		}
+
+		public void Return(Color color)
+		{
+			if (_cache.TryGetValue(color, out var cacheItem))
+			{
+				if (cacheItem.Count == 1)
+					_cache.Remove(color);
+				else
+					_cache[color] = (cacheItem.Drawable, cacheItem.Count + 1);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Stubs/CustomImageCacheStub.iOS.cs b/src/Core/tests/DeviceTests/Stubs/CustomImageCacheStub.iOS.cs
new file mode 100644
index 000000000000..70783f2c3ff0
--- /dev/null
+++ b/src/Core/tests/DeviceTests/Stubs/CustomImageCacheStub.iOS.cs
@@ -0,0 +1,52 @@
+using System.Collections.Generic;
+using CoreGraphics;
+using Microsoft.Maui.Graphics;
+using UIKit;
+
+namespace Microsoft.Maui.DeviceTests.Stubs
+{
+	class CustomImageCacheStub
+	{
+		readonly Dictionary<Color, (UIImage Image, int Count)> _cache = new Dictionary<Color, (UIImage, int)>();
+
+		public IReadOnlyDictionary<Color, (UIImage Image, int Count)> Cache => _cache;
+
+		public UIImage Get(Color color)
+		{
+			if (_cache.TryGetValue(color, out var cacheItem))
+			{
+				_cache[color] = (cacheItem.Image, cacheItem.Count + 1);
+				return cacheItem.Image;
+			}
+
+			var rect = new CGRect(0, 0, 100, 100);
+
+			UIGraphics.BeginImageContextWithOptions(rect.Size, false, 1);
+			var context = UIGraphics.GetCurrentContext();
+
+			color.ToNative().SetFill();
+			context.FillRect(rect);
+
+			var image = UIGraphics.GetImageFromCurrentImageContext();
+
+			UIGraphics.EndImageContext();
+
+			image = image.ImageWithRenderingMode(UIImageRenderingMode.AlwaysOriginal);
+
+			_cache[color] = (image, 1);
+
+			return image;
+		}
+
+		public void Return(Color color)
+		{
+			if (_cache.TryGetValue(color, out var cacheItem))
+			{
+				if (cacheItem.Count == 1)
+					_cache.Remove(color);
+				else
+					_cache[color] = (cacheItem.Image, cacheItem.Count + 1);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Stubs/CustomImageSourceServiceStub.Android.cs b/src/Core/tests/DeviceTests/Stubs/CustomImageSourceServiceStub.Android.cs
new file mode 100644
index 000000000000..3126df2cc0a1
--- /dev/null
+++ b/src/Core/tests/DeviceTests/Stubs/CustomImageSourceServiceStub.Android.cs
@@ -0,0 +1,36 @@
+using System.Threading;
+using System.Threading.Tasks;
+using Android.Content;
+using Android.Graphics.Drawables;
+
+namespace Microsoft.Maui.DeviceTests.Stubs
+{
+	class CustomImageSourceServiceStub : IImageSourceService<ICustomImageSourceStub>
+	{
+		readonly CustomImageCacheStub _cache;
+
+		public CustomImageSourceServiceStub(CustomImageCacheStub cache)
+		{
+			_cache = cache;
+		}
+
+		public Task<IImageSourceServiceResult<Drawable>> GetDrawableAsync(IImageSource imageSource, Context context, CancellationToken cancellationToken = default)
+		{
+			if (imageSource is ICustomImageSourceStub counted)
+				return GetDrawableAsync(counted, context, cancellationToken);
+
+			return Task.FromResult<IImageSourceServiceResult<Drawable>>(null);
+		}
+
+		public Task<IImageSourceServiceResult<Drawable>> GetDrawableAsync(ICustomImageSourceStub imageSource, Context context, CancellationToken cancellationToken = default)
+		{
+			var color = imageSource.Color;
+
+			var drawable = _cache.Get(color);
+
+			var result = new ImageSourceServiceResult(drawable, () => _cache.Return(color));
+
+			return Task.FromResult<IImageSourceServiceResult<Drawable>>(result);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Stubs/CustomImageSourceServiceStub.iOS.cs b/src/Core/tests/DeviceTests/Stubs/CustomImageSourceServiceStub.iOS.cs
new file mode 100644
index 000000000000..07fe86fa34f5
--- /dev/null
+++ b/src/Core/tests/DeviceTests/Stubs/CustomImageSourceServiceStub.iOS.cs
@@ -0,0 +1,30 @@
+using System.Threading;
+using System.Threading.Tasks;
+using UIKit;
+
+namespace Microsoft.Maui.DeviceTests.Stubs
+{
+	class CustomImageSourceServiceStub : IImageSourceService<ICustomImageSourceStub>
+	{
+		readonly CustomImageCacheStub _cache;
+
+		public CustomImageSourceServiceStub(CustomImageCacheStub cache)
+		{
+			_cache = cache;
+		}
+
+		public Task<IImageSourceServiceResult<UIImage>> GetImageAsync(IImageSource imageSource, float scale = 1, CancellationToken cancellationToken = default) =>
+			GetImageAsync((ICustomImageSourceStub)imageSource, scale, cancellationToken);
+
+		public Task<IImageSourceServiceResult<UIImage>> GetImageAsync(ICustomImageSourceStub imageSource, float scale = 1, CancellationToken cancellationToken = default)
+		{
+			var color = imageSource.Color;
+
+			var drawable = _cache.Get(color);
+
+			var result = new ImageSourceServiceResult(drawable, () => _cache.Return(color));
+
+			return Task.FromResult<IImageSourceServiceResult<UIImage>>(result);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Stubs/CustomImageSourceStub.cs b/src/Core/tests/DeviceTests/Stubs/CustomImageSourceStub.cs
new file mode 100644
index 000000000000..cdbcc8180e9f
--- /dev/null
+++ b/src/Core/tests/DeviceTests/Stubs/CustomImageSourceStub.cs
@@ -0,0 +1,23 @@
+using Microsoft.Maui.Graphics;
+
+namespace Microsoft.Maui.DeviceTests.Stubs
+{
+	public interface ICustomImageSourceStub : IImageSource
+	{
+		Color Color { get; }
+	}
+
+	public partial class CustomImageSourceStub : ImageSourceStub, ICustomImageSourceStub
+	{
+		public CustomImageSourceStub()
+		{
+		}
+
+		public CustomImageSourceStub(Color color)
+		{
+			Color = color;
+		}
+
+		public Color Color { get; set; }
+	}
+}
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Stubs/EditorStub.cs b/src/Core/tests/DeviceTests/Stubs/EditorStub.cs
index c3e220bd7d4c..8c6966f57d02 100644
--- a/src/Core/tests/DeviceTests/Stubs/EditorStub.cs
+++ b/src/Core/tests/DeviceTests/Stubs/EditorStub.cs
@@ -37,5 +37,10 @@ public string Text
 
 		void OnTextChanged(string oldValue, string newValue) =>
 			TextChanged?.Invoke(this, new StubPropertyChangedEventArgs<string>(oldValue, newValue));
+
+		public event EventHandler Completed;
+
+		void IEditor.Completed() =>
+			Completed?.Invoke(this, EventArgs.Empty);
 	}
 }
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Stubs/EntryStub.cs b/src/Core/tests/DeviceTests/Stubs/EntryStub.cs
index fc70d4da65fd..6dd2ef922cdd 100644
--- a/src/Core/tests/DeviceTests/Stubs/EntryStub.cs
+++ b/src/Core/tests/DeviceTests/Stubs/EntryStub.cs
@@ -32,13 +32,19 @@ public string Text
 		public TextAlignment HorizontalTextAlignment { get; set; }
 
 		public ReturnType ReturnType { get; set; }
+
 		public ClearButtonVisibility ClearButtonVisibility { get; set; }
 
+		public Keyboard Keyboard { get; set; } = Keyboard.Default;
+
 		public event EventHandler<StubPropertyChangedEventArgs<string>> TextChanged;
 
+		public event EventHandler Completed;
+
+		void IEntry.Completed() =>
+			Completed?.Invoke(this, EventArgs.Empty);
+
 		void OnTextChanged(string oldValue, string newValue) =>
 			TextChanged?.Invoke(this, new StubPropertyChangedEventArgs<string>(oldValue, newValue));
-
-		public Keyboard Keyboard { get; set; } = Keyboard.Default;
 	}
 }
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Stubs/ImageSourceStub.cs b/src/Core/tests/DeviceTests/Stubs/ImageSourceStub.cs
new file mode 100644
index 000000000000..fb71ff8cbe9a
--- /dev/null
+++ b/src/Core/tests/DeviceTests/Stubs/ImageSourceStub.cs
@@ -0,0 +1,94 @@
+using System;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Maui.Graphics;
+
+namespace Microsoft.Maui.DeviceTests.Stubs
+{
+	public abstract partial class ImageSourceStub : IImageSource
+	{
+		public bool IsEmpty { get; set; }
+	}
+
+	public partial class FileImageSourceStub : ImageSourceStub, IFileImageSource
+	{
+		public FileImageSourceStub()
+		{
+		}
+
+		public FileImageSourceStub(string file)
+		{
+			File = file;
+		}
+
+		public string File { get; set; }
+	}
+
+	public partial class FontImageSourceStub : ImageSourceStub, IFontImageSource
+	{
+		public FontImageSourceStub()
+		{
+		}
+
+		public Color Color { get; set; }
+
+		public string Glyph { get; set; }
+
+		public Font Font { get; set; }
+	}
+
+	public partial class StreamImageSourceStub : ImageSourceStub, IStreamImageSource
+	{
+		public StreamImageSourceStub()
+		{
+		}
+
+		public StreamImageSourceStub(Stream stream)
+		{
+			Stream = token => Task.FromResult(stream);
+		}
+
+		public StreamImageSourceStub(Func<CancellationToken, Task<Stream>> stream)
+		{
+			Stream = stream;
+		}
+
+		public StreamImageSourceStub(Func<Stream> stream)
+		{
+			Stream = token => Task.FromResult(stream());
+		}
+
+		public Func<CancellationToken, Task<Stream>> Stream { get; set; }
+
+		public Task<Stream> GetStreamAsync(CancellationToken cancellationToken = default) =>
+			Stream?.Invoke(cancellationToken);
+	}
+
+	public partial class UriImageSourceStub : ImageSourceStub, IUriImageSource
+	{
+		public UriImageSourceStub()
+		{
+		}
+
+		public UriImageSourceStub(string uri)
+			: this(new Uri(uri))
+		{
+		}
+
+		public UriImageSourceStub(Uri uri)
+		{
+			Uri = uri;
+		}
+
+		public Uri Uri { get; set; }
+
+		public TimeSpan CacheValidity { get; set; } = TimeSpan.FromDays(1);
+
+		public bool CachingEnabled { get; set; } = true;
+	}
+
+	public partial class InvalidImageSourceStub : ImageSourceStub
+	{
+	}
+}
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Stubs/ImageStub.cs b/src/Core/tests/DeviceTests/Stubs/ImageStub.cs
new file mode 100644
index 000000000000..b3557ed66ec2
--- /dev/null
+++ b/src/Core/tests/DeviceTests/Stubs/ImageStub.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Threading.Tasks;
+
+namespace Microsoft.Maui.DeviceTests.Stubs
+{
+	public partial class ImageStub : StubBase, IImage, IImageSourcePartEvents
+	{
+		public Aspect Aspect { get; set; }
+
+		public bool IsOpaque { get; set; }
+
+		public IImageSource Source { get; set; }
+
+		public bool IsAnimationPlaying { get; set; }
+
+		public bool IsLoading { get; private set; }
+
+		public event Action LoadingStarted;
+		public event Action<bool> LoadingCompleted;
+		public event Action<Exception> LoadingFailed;
+
+		public void UpdateIsLoading(bool isLoading) =>
+			IsLoading = isLoading;
+
+		void IImageSourcePartEvents.LoadingCompleted(bool successful) =>
+			LoadingCompleted?.Invoke(successful);
+
+		void IImageSourcePartEvents.LoadingFailed(Exception exception) =>
+			LoadingFailed?.Invoke(exception);
+
+		void IImageSourcePartEvents.LoadingStarted() =>
+			LoadingStarted?.Invoke();
+	}
+
+	public static class ImageStubExtensions
+	{
+		static readonly Random rnd = new Random();
+
+		public static async Task Wait(this ImageStub image, int timeout = 1000)
+		{
+			while ((timeout -= 100) > 0)
+			{
+				if (image.IsLoading)
+					await Task.Delay(rnd.Next(100, 200));
+				else
+					break;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Stubs/PickerStub.cs b/src/Core/tests/DeviceTests/Stubs/PickerStub.cs
index c4e0cce97f8e..ec75dbbc6659 100644
--- a/src/Core/tests/DeviceTests/Stubs/PickerStub.cs
+++ b/src/Core/tests/DeviceTests/Stubs/PickerStub.cs
@@ -23,5 +23,18 @@ public partial class PickerStub : StubBase, IPicker
 		public Font Font { get; set; }
 
 		public TextAlignment HorizontalTextAlignment { get; set; }
+
+		int IItemDelegate<string>.GetCount() => Items?.Count ?? ItemsSource?.Count ?? 0;
+
+		string IItemDelegate<string>.GetItem(int index)
+		{
+			if (index < 0)
+				return "";
+			if (index < Items?.Count)
+				return Items[index];
+			if (index < ItemsSource?.Count)
+				return ItemsSource[index]?.ToString() ?? "";
+			return "";
+		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Core/tests/DeviceTests/Stubs/SearchBarStub.cs b/src/Core/tests/DeviceTests/Stubs/SearchBarStub.cs
index 47d2a944f942..155ad02a413c 100644
--- a/src/Core/tests/DeviceTests/Stubs/SearchBarStub.cs
+++ b/src/Core/tests/DeviceTests/Stubs/SearchBarStub.cs
@@ -25,5 +25,7 @@ public partial class SearchBarStub : StubBase, ISearchBar
 		public int MaxLength { get; set; }
 
 		public Keyboard Keyboard { get; set; }
+
+		public void SearchButtonPressed() { }
 	}
 }
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Stubs/SolidPaintStub.cs b/src/Core/tests/DeviceTests/Stubs/SolidPaintStub.cs
new file mode 100644
index 000000000000..f9d1ef16e777
--- /dev/null
+++ b/src/Core/tests/DeviceTests/Stubs/SolidPaintStub.cs
@@ -0,0 +1,29 @@
+using Microsoft.Maui.Graphics;
+
+namespace Microsoft.Maui.DeviceTests.Stubs
+{
+	partial class SolidPaintStub : SolidPaint
+	{
+		public SolidPaintStub(Color color)
+		{
+			Color = color;
+		}
+
+#if IOS || __IOS__
+		public CoreAnimation.CALayer ToCALayer(CoreGraphics.CGRect frame = default) =>
+			new CoreAnimation.CALayer
+			{
+				ContentsGravity = CoreAnimation.CALayer.GravityResizeAspectFill,
+				BackgroundColor = Color.ToCGColor(),
+				Frame = frame,
+			};
+#elif MONOANDROID || __ANDROID__
+		public Android.Graphics.Drawables.Drawable ToDrawable()
+		{
+			var drawable = new Microsoft.Maui.Graphics.MauiDrawable();
+			drawable.SetColor(Color.ToNative());
+			return drawable;
+		}
+#endif
+	}
+}
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/Stubs/StubBase.cs b/src/Core/tests/DeviceTests/Stubs/StubBase.cs
index 8642cdde1795..14ba8b32bd6c 100644
--- a/src/Core/tests/DeviceTests/Stubs/StubBase.cs
+++ b/src/Core/tests/DeviceTests/Stubs/StubBase.cs
@@ -10,9 +10,13 @@ public class StubBase : IFrameworkElement
 	{
 		public bool IsEnabled { get; set; } = true;
 
-		public Color BackgroundColor { get; set; }
+		public Visibility Visibility { get; set; } = Visibility.Visible;
 
-		public Rectangle Frame { get; set; } = new Rectangle(0, 0, 20, 20);
+		public double Opacity { get; set; } = 1.0d;
+
+		public Paint Background { get; set; }
+
+		public Rectangle Frame { get; set; }
 
 		public IViewHandler Handler { get; set; }
 
@@ -20,9 +24,9 @@ public class StubBase : IFrameworkElement
 
 		public Size DesiredSize { get; set; } = new Size(20, 20);
 
-		public double Width { get; set; }
+		public double Width { get; set; } = 20;
 
-		public double Height { get; set; }
+		public double Height { get; set; } = 20;
 
 		public Thickness Margin { get; set; }
 
diff --git a/src/Core/tests/DeviceTests/Stubs/WindowStub.cs b/src/Core/tests/DeviceTests/Stubs/WindowStub.cs
index ff325df3fe4f..f9be356dd27e 100644
--- a/src/Core/tests/DeviceTests/Stubs/WindowStub.cs
+++ b/src/Core/tests/DeviceTests/Stubs/WindowStub.cs
@@ -1,8 +1,7 @@
 namespace Microsoft.Maui.DeviceTests.Stubs
 {
-	public class WindowStub : IWindow
+	public class WindowStub : StubBase, IWindow
 	{
-		public IMauiContext MauiContext { get; set; }
-		public IPage Page { get; set; }
+		public IView View { get; set; }
 	}
 }
\ No newline at end of file
diff --git a/src/Core/tests/DeviceTests/TestBase.cs b/src/Core/tests/DeviceTests/TestBase.cs
index 28a4df21f58f..250da0e2c6bc 100644
--- a/src/Core/tests/DeviceTests/TestBase.cs
+++ b/src/Core/tests/DeviceTests/TestBase.cs
@@ -1,6 +1,21 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.Maui.Essentials;
+
 namespace Microsoft.Maui.DeviceTests
 {
 	public partial class TestBase
 	{
+		public Task<T> InvokeOnMainThreadAsync<T>(Func<T> func) =>
+			MainThread.InvokeOnMainThreadAsync(func);
+
+		protected Task InvokeOnMainThreadAsync(Action action) =>
+			MainThread.InvokeOnMainThreadAsync(action);
+
+		protected Task InvokeOnMainThreadAsync(Func<Task> func) =>
+			MainThread.InvokeOnMainThreadAsync(func);
+
+		public Task<T> InvokeOnMainThreadAsync<T>(Func<Task<T>> func) =>
+			MainThread.InvokeOnMainThreadAsync(func);
 	}
 }
diff --git a/src/Core/tests/DeviceTests/TestBase.iOS.cs b/src/Core/tests/DeviceTests/TestBase.iOS.cs
new file mode 100644
index 000000000000..28a4df21f58f
--- /dev/null
+++ b/src/Core/tests/DeviceTests/TestBase.iOS.cs
@@ -0,0 +1,6 @@
+namespace Microsoft.Maui.DeviceTests
+{
+	public partial class TestBase
+	{
+	}
+}
diff --git a/src/Core/tests/DeviceTests/TestCategory.cs b/src/Core/tests/DeviceTests/TestCategory.cs
index 0d78c8bcdbad..d3c3144dd4f2 100644
--- a/src/Core/tests/DeviceTests/TestCategory.cs
+++ b/src/Core/tests/DeviceTests/TestCategory.cs
@@ -8,6 +8,8 @@ public static class TestCategory
 		public const string DatePicker = "DatePicker";
 		public const string Editor = "Editor";
 		public const string Entry = "Entry";
+		public const string Image = "Image";
+		public const string ImageSource = "ImageSource";
 		public const string Label = "Label";
 		public const string Layout = "Layout";
 		public const string Picker = "Picker";
diff --git a/src/Core/tests/DeviceTests/iOS/ColorComparison.cs b/src/Core/tests/DeviceTests/iOS/ColorComparison.cs
index 425b0962cdd6..e9bc0feedcef 100644
--- a/src/Core/tests/DeviceTests/iOS/ColorComparison.cs
+++ b/src/Core/tests/DeviceTests/iOS/ColorComparison.cs
@@ -6,13 +6,13 @@ namespace Microsoft.Maui.DeviceTests
 {
 	internal class ColorComparison : IEqualityComparer<UIColor>
 	{
-		public static bool ARGBEquivalent(UIColor color1, UIColor color2)
+		public const double Tolerance = 0.000001;
+
+		public static bool ARGBEquivalent(UIColor color1, UIColor color2, double tolerance = Tolerance)
 		{
 			color1.GetRGBA(out nfloat red1, out nfloat green1, out nfloat blue1, out nfloat alpha1);
 			color2.GetRGBA(out nfloat red2, out nfloat green2, out nfloat blue2, out nfloat alpha2);
 
-			const double tolerance = 0.000001;
-
 			return Equal(red1, red2, tolerance)
 				&& Equal(green1, green2, tolerance)
 				&& Equal(blue1, blue2, tolerance)
diff --git a/src/Core/tests/UnitTests/AbstractViewHandlerTests.cs b/src/Core/tests/UnitTests/AbstractViewHandlerTests.cs
index 32d15402abe4..39cccc79f044 100644
--- a/src/Core/tests/UnitTests/AbstractViewHandlerTests.cs
+++ b/src/Core/tests/UnitTests/AbstractViewHandlerTests.cs
@@ -75,7 +75,7 @@ public void GetRequiredServiceRetrievesService()
 			HandlerStub handlerStub = new HandlerStub();
 
 			var collection = new MauiServiceCollection();
-			collection.TryAddSingleton<IMauiHandlersServiceProvider>(new MauiHandlersServiceProvider(new MauiServiceCollection()));
+			collection.TryAddSingleton<IMauiHandlersServiceProvider>(new MauiHandlersServiceProvider(new MauiHandlersCollection()));
 			collection.TryAddSingleton<IFooService, FooService>();
 
 			var provider = new MauiServiceProvider(collection, false);
diff --git a/src/Core/tests/UnitTests/Core.UnitTests.csproj b/src/Core/tests/UnitTests/Core.UnitTests.csproj
index 87c34004d810..e0ea601cc5bf 100644
--- a/src/Core/tests/UnitTests/Core.UnitTests.csproj
+++ b/src/Core/tests/UnitTests/Core.UnitTests.csproj
@@ -16,6 +16,7 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Core/tests/UnitTests/Hosting/HostBuilderAppConfigurationTests.cs b/src/Core/tests/UnitTests/Hosting/HostBuilderAppConfigurationTests.cs
index 51f7c08ec7a6..b0f41086aa62 100644
--- a/src/Core/tests/UnitTests/Hosting/HostBuilderAppConfigurationTests.cs
+++ b/src/Core/tests/UnitTests/Hosting/HostBuilderAppConfigurationTests.cs
@@ -4,7 +4,7 @@
 using Microsoft.Maui.Hosting;
 using Xunit;
 
-namespace Microsoft.Maui.UnitTests
+namespace Microsoft.Maui.UnitTests.Hosting
 {
 	[Category(TestCategory.Core, TestCategory.Hosting)]
 	public class HostBuilderAppConfigurationTests
diff --git a/src/Core/tests/UnitTests/Hosting/HostBuilderAppTests.cs b/src/Core/tests/UnitTests/Hosting/HostBuilderAppTests.cs
index f70a863714f1..ed71205217af 100644
--- a/src/Core/tests/UnitTests/Hosting/HostBuilderAppTests.cs
+++ b/src/Core/tests/UnitTests/Hosting/HostBuilderAppTests.cs
@@ -2,7 +2,7 @@
 using Microsoft.Maui.Hosting;
 using Xunit;
 
-namespace Microsoft.Maui.UnitTests
+namespace Microsoft.Maui.UnitTests.Hosting
 {
 	[Category(TestCategory.Core, TestCategory.Hosting)]
 	public class HostBuilderAppTests
diff --git a/src/Core/tests/UnitTests/Hosting/HostBuilderFontsTests.cs b/src/Core/tests/UnitTests/Hosting/HostBuilderFontsTests.cs
index 9a1817ae23a2..1ab01e5f13c5 100644
--- a/src/Core/tests/UnitTests/Hosting/HostBuilderFontsTests.cs
+++ b/src/Core/tests/UnitTests/Hosting/HostBuilderFontsTests.cs
@@ -4,7 +4,7 @@
 using Microsoft.Maui.Hosting;
 using Xunit;
 
-namespace Microsoft.Maui.UnitTests
+namespace Microsoft.Maui.UnitTests.Hosting
 {
 	[Category(TestCategory.Core, TestCategory.Hosting)]
 	public class HostBuilderFontsTests
@@ -40,12 +40,14 @@ public void ConfigureFontsRegistersFonts(string filename, string alias)
 
 			var registrar = host.Services.GetRequiredService<IFontRegistrar>();
 
-			Assert.True(registrar.TryGetFont(filename, out var path));
+			var path = registrar.GetFont(filename);
+			Assert.NotNull(path);
 			Assert.StartsWith(root, path);
 
 			if (alias != null)
 			{
-				Assert.True(registrar.TryGetFont(alias, out path));
+				path = registrar.GetFont(alias);
+				Assert.NotNull(path);
 				Assert.StartsWith(root, path);
 			}
 
diff --git a/src/Core/tests/UnitTests/Hosting/HostBuilderHandlerTests.cs b/src/Core/tests/UnitTests/Hosting/HostBuilderHandlerTests.cs
index e9eb8ca7cd85..2d7e35c4b4fe 100644
--- a/src/Core/tests/UnitTests/Hosting/HostBuilderHandlerTests.cs
+++ b/src/Core/tests/UnitTests/Hosting/HostBuilderHandlerTests.cs
@@ -3,10 +3,9 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Maui.Handlers;
 using Microsoft.Maui.Hosting;
-using Microsoft.Maui.Hosting.Internal;
 using Xunit;
 
-namespace Microsoft.Maui.UnitTests
+namespace Microsoft.Maui.UnitTests.Hosting
 {
 	[Category(TestCategory.Core, TestCategory.Hosting)]
 	public class HostBuilderHandlerTests
@@ -14,8 +13,8 @@ public class HostBuilderHandlerTests
 		[Fact]
 		public void CanBuildAHost()
 		{
-			var host = AppHostBuilder
-				.CreateDefaultAppBuilder()
+			var host = AppHost
+				.CreateDefaultBuilder()
 				.Build();
 
 			Assert.NotNull(host);
@@ -24,22 +23,22 @@ public void CanBuildAHost()
 		[Fact]
 		public void CanGetIMauiHandlersServiceProviderFromServices()
 		{
-			var host = AppHostBuilder
-				.CreateDefaultAppBuilder()
+			var host = AppHost
+				.CreateDefaultBuilder()
 				.Build();
 
 			Assert.NotNull(host);
 			Assert.NotNull(host.Services);
 			Assert.NotNull(host.Handlers);
-			Assert.IsType<MauiHandlersServiceProvider>(host.Handlers);
+			Assert.IsType<Maui.Hosting.Internal.MauiHandlersServiceProvider>(host.Handlers);
 			Assert.Equal(host.Handlers, host.Services.GetService<IMauiHandlersServiceProvider>());
 		}
 
 		[Fact]
 		public void CanRegisterAndGetHandlerUsingType()
 		{
-			var host = AppHostBuilder
-				.CreateDefaultAppBuilder()
+			var host = AppHost
+				.CreateDefaultBuilder()
 				.ConfigureMauiHandlers((_, handlers) => handlers.AddHandler<IViewStub, ViewHandlerStub>())
 				.Build();
 
@@ -52,8 +51,8 @@ public void CanRegisterAndGetHandlerUsingType()
 		[Fact]
 		public void CanRegisterAndGetHandler()
 		{
-			var host = AppHostBuilder
-				.CreateDefaultAppBuilder()
+			var host = AppHost
+				.CreateDefaultBuilder()
 				.ConfigureMauiHandlers((_, handlers) => handlers.AddHandler<IViewStub, ViewHandlerStub>())
 				.Build();
 
@@ -66,8 +65,8 @@ public void CanRegisterAndGetHandler()
 		[Fact]
 		public void CanRegisterAndGetHandlerWithType()
 		{
-			var host = AppHostBuilder
-				.CreateDefaultAppBuilder()
+			var host = AppHost
+				.CreateDefaultBuilder()
 				.ConfigureMauiHandlers((_, handlers) => handlers.AddHandler(typeof(IViewStub), typeof(ViewHandlerStub)))
 				.Build();
 
@@ -85,8 +84,8 @@ public void CanRegisterAndGetHandlerWithDictionary()
 				{ typeof(IViewStub), typeof(ViewHandlerStub) }
 			};
 
-			var host = AppHostBuilder
-				.CreateDefaultAppBuilder()
+			var host = AppHost
+				.CreateDefaultBuilder()
 				.ConfigureMauiHandlers((_, handlers) => handlers.AddHandlers(dic))
 				.Build();
 
@@ -99,8 +98,8 @@ public void CanRegisterAndGetHandlerWithDictionary()
 		[Fact]
 		public void CanRegisterAndGetHandlerForConcreteType()
 		{
-			var host = AppHostBuilder
-				.CreateDefaultAppBuilder()
+			var host = AppHost
+				.CreateDefaultBuilder()
 				.ConfigureMauiHandlers((_, handlers) => handlers.AddHandler<IViewStub, ViewHandlerStub>())
 				.Build();
 
@@ -113,8 +112,8 @@ public void CanRegisterAndGetHandlerForConcreteType()
 		[Fact]
 		public void DefaultHandlersAreRegistered()
 		{
-			var host = AppHostBuilder
-				.CreateDefaultAppBuilder()
+			var host = AppHost
+				.CreateDefaultBuilder()
 				.Build();
 
 			var handler = host.Handlers.GetHandler(typeof(IButton));
@@ -126,8 +125,8 @@ public void DefaultHandlersAreRegistered()
 		[Fact]
 		public void CanSpecifyHandler()
 		{
-			var host = AppHostBuilder
-				.CreateDefaultAppBuilder()
+			var host = AppHost
+				.CreateDefaultBuilder()
 				.ConfigureMauiHandlers((_, handlers) => handlers.AddHandler<ButtonStub, ButtonHandlerStub>())
 				.Build();
 
@@ -139,5 +138,22 @@ public void CanSpecifyHandler()
 			Assert.IsType<ButtonHandler>(defaultHandler);
 			Assert.IsType<ButtonHandlerStub>(specificHandler);
 		}
+
+		[Fact]
+		public void CanChangeHandlerRegistration()
+		{
+			var host = AppHost
+				.CreateDefaultBuilder()
+				.ConfigureMauiHandlers((_, handlers) => handlers.AddHandler<ButtonStub, ButtonHandlerStub>())
+				.Build();
+
+			var specificHandler = host.Handlers.GetHandler(typeof(ButtonStub));
+			Assert.IsType<ButtonHandlerStub>(specificHandler);
+
+			host.Handlers.GetCollection().AddHandler<ButtonStub, AlternateButtonHandlerStub>();
+
+			var alternateHandler = host.Handlers.GetHandler(typeof(ButtonStub));
+			Assert.IsType<AlternateButtonHandlerStub>(alternateHandler);
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/tests/UnitTests/Hosting/HostBuilderImageSourceTests.cs b/src/Core/tests/UnitTests/Hosting/HostBuilderImageSourceTests.cs
new file mode 100644
index 000000000000..92f4b5987bc8
--- /dev/null
+++ b/src/Core/tests/UnitTests/Hosting/HostBuilderImageSourceTests.cs
@@ -0,0 +1,70 @@
+using System;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Maui.Hosting;
+using Xunit;
+
+namespace Microsoft.Maui.UnitTests.Hosting
+{
+	[Category(TestCategory.Core, TestCategory.Hosting)]
+	public class HostBuilderImageSourceTests
+	{
+		[Theory]
+		[InlineData(typeof(IFileImageSource))]
+		[InlineData(typeof(FileImageSourceStub))]
+		public void CanRetrieveFileUsingInterfaceImageSource(Type type)
+		{
+			var host = new AppHostBuilder()
+				.ConfigureImageSources()
+				.Build();
+
+			var images = host.Services.GetRequiredService<IImageSourceServiceProvider>();
+			Assert.NotNull(images);
+
+			var imageSourceService = images.GetRequiredImageSourceService(type);
+			Assert.NotNull(imageSourceService);
+			Assert.IsType<FileImageSourceService>(imageSourceService);
+		}
+
+		[Fact]
+		public void CanRetrieveFontUsingInterfaceImageSource()
+		{
+			var host = new AppHostBuilder()
+				.ConfigureFonts()
+				.ConfigureImageSources()
+				.Build();
+
+			var manager = host.Services.GetRequiredService<IFontManager>();
+			Assert.NotNull(manager);
+
+			var images = host.Services.GetRequiredService<IImageSourceServiceProvider>();
+			Assert.NotNull(images);
+
+			var imageSourceService = images.GetRequiredImageSourceService<IFontImageSource>();
+			Assert.NotNull(imageSourceService);
+			var fontService = Assert.IsType<FontImageSourceService>(imageSourceService);
+
+			Assert.Equal(manager, fontService.FontManager);
+		}
+
+		[Fact]
+		public void CanRetrieveFontUsingConcreteImageSource()
+		{
+			var host = new AppHostBuilder()
+				.ConfigureFonts()
+				.ConfigureImageSources()
+				.Build();
+
+			var manager = host.Services.GetRequiredService<IFontManager>();
+			Assert.NotNull(manager);
+
+			var images = host.Services.GetRequiredService<IImageSourceServiceProvider>();
+			Assert.NotNull(images);
+
+			var imageSourceService = images.GetRequiredImageSourceService<FontImageSourceStub>();
+			Assert.NotNull(imageSourceService);
+			var fontService = Assert.IsType<FontImageSourceService>(imageSourceService);
+
+			Assert.Equal(manager, fontService.FontManager);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Core/tests/UnitTests/Hosting/HostBuilderServiceBuilderTests.cs b/src/Core/tests/UnitTests/Hosting/HostBuilderServiceBuilderTests.cs
index f015318dd92b..a2b3eb9158c3 100644
--- a/src/Core/tests/UnitTests/Hosting/HostBuilderServiceBuilderTests.cs
+++ b/src/Core/tests/UnitTests/Hosting/HostBuilderServiceBuilderTests.cs
@@ -8,7 +8,7 @@
 using Microsoft.Maui.Hosting;
 using Xunit;
 
-namespace Microsoft.Maui.UnitTests
+namespace Microsoft.Maui.UnitTests.Hosting
 {
 	[Category(TestCategory.Core, TestCategory.Hosting)]
 	public class HostBuilderServiceBuilderTests
diff --git a/src/Core/tests/UnitTests/Hosting/HostBuilderServicesTests.cs b/src/Core/tests/UnitTests/Hosting/HostBuilderServicesTests.cs
index 3abdb34aaa26..ebd6c50b01c6 100644
--- a/src/Core/tests/UnitTests/Hosting/HostBuilderServicesTests.cs
+++ b/src/Core/tests/UnitTests/Hosting/HostBuilderServicesTests.cs
@@ -1,9 +1,11 @@
 using System;
+using System.Linq;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 using Microsoft.Maui.Hosting;
 using Xunit;
 
-namespace Microsoft.Maui.UnitTests
+namespace Microsoft.Maui.UnitTests.Hosting
 {
 	[Category(TestCategory.Core, TestCategory.Hosting)]
 	public class HostBuilderServicesTests
@@ -30,16 +32,180 @@ public void GetServiceThrowsWhenConstructorParamTypesWereNotRegistered()
 		}
 
 		[Fact]
-		public void GetServiceThrowsOnMultipleConstructors()
+		public void GetServiceThrowsWhenNoPublicConstructors()
 		{
 			var host = new AppHostBuilder()
 				.UseMauiServiceProviderFactory(true)
-				.ConfigureServices((ctx, services) => services.AddTransient<IFooBarService, FooDualConstructor>())
+				.ConfigureServices((ctx, services) => services.AddTransient<IFooService, BadFooService>())
 				.Build();
 
-			var ex = Assert.Throws<InvalidOperationException>(() => host.Services.GetService<IFooBarService>());
+			var ex = Assert.Throws<InvalidOperationException>(() => host.Services.GetService<IFooService>());
+			Assert.Contains("public or internal constructors", ex.Message);
+		}
+
+		[Fact]
+		public void GetServiceHandlesFirstOfMultipleConstructors()
+		{
+			var host = new AppHostBuilder()
+				.UseMauiServiceProviderFactory(true)
+				.ConfigureServices((ctx, services) =>
+				{
+					services.AddTransient<IFooService, FooService>();
+					services.AddTransient<IFooBarService, FooDualConstructor>();
+				})
+				.Build();
+
+			var service = host.Services.GetService<IFooBarService>();
+
+			var foobar = Assert.IsType<FooDualConstructor>(service);
+			Assert.IsType<FooService>(foobar.Foo);
+		}
+
+		[Fact]
+		public void GetServiceHandlesSecondOfMultipleConstructors()
+		{
+			var host = new AppHostBuilder()
+				.UseMauiServiceProviderFactory(true)
+				.ConfigureServices((ctx, services) =>
+				{
+					services.AddTransient<IBarService, BarService>();
+					services.AddTransient<IFooBarService, FooDualConstructor>();
+				})
+				.Build();
+
+			var service = host.Services.GetService<IFooBarService>();
+
+			var foobar = Assert.IsType<FooDualConstructor>(service);
+			Assert.IsType<BarService>(foobar.Bar);
+		}
+
+		[Fact]
+		public void GetServiceHandlesUsesCorrectCtor_DefaultWithNothing()
+		{
+			var host = new AppHostBuilder()
+				.UseMauiServiceProviderFactory(true)
+				.ConfigureServices((ctx, services) =>
+				{
+					services.AddTransient<IFooBarService, FooTrioConstructor>();
+				})
+				.Build();
+
+			var service = host.Services.GetService<IFooBarService>();
+
+			var trio = Assert.IsType<FooTrioConstructor>(service);
+			Assert.Null(trio.Foo);
+			Assert.Null(trio.Bar);
+			Assert.Null(trio.Cat);
+			Assert.Equal("()", trio.Option);
+		}
+
+		[Fact]
+		public void GetServiceHandlesUsesCorrectCtor_DefaultWithBar()
+		{
+			var host = new AppHostBuilder()
+				.UseMauiServiceProviderFactory(true)
+				.ConfigureServices((ctx, services) =>
+				{
+					services.AddTransient<IBarService, BarService>();
+					services.AddTransient<IFooBarService, FooTrioConstructor>();
+				})
+				.Build();
+
+			var service = host.Services.GetService<IFooBarService>();
+
+			var trio = Assert.IsType<FooTrioConstructor>(service);
+			Assert.Null(trio.Foo);
+			Assert.Null(trio.Bar);
+			Assert.Null(trio.Cat);
+			Assert.Equal("()", trio.Option);
+		}
+
+		[Fact]
+		public void GetServiceHandlesUsesCorrectCtor_Foo()
+		{
+			var host = new AppHostBuilder()
+				.UseMauiServiceProviderFactory(true)
+				.ConfigureServices((ctx, services) =>
+				{
+					services.AddTransient<IFooService, FooService>();
+					services.AddTransient<IFooBarService, FooTrioConstructor>();
+				})
+				.Build();
+
+			var service = host.Services.GetService<IFooBarService>();
+
+			var trio = Assert.IsType<FooTrioConstructor>(service);
+			Assert.IsType<FooService>(trio.Foo);
+			Assert.Null(trio.Bar);
+			Assert.Null(trio.Cat);
+			Assert.Equal("(Foo)", trio.Option);
+		}
+
+		[Fact]
+		public void GetServiceHandlesUsesCorrectCtor_FooWithCat()
+		{
+			var host = new AppHostBuilder()
+				.UseMauiServiceProviderFactory(true)
+				.ConfigureServices((ctx, services) =>
+				{
+					services.AddTransient<IFooService, FooService>();
+					services.AddTransient<ICatService, CatService>();
+					services.AddTransient<IFooBarService, FooTrioConstructor>();
+				})
+				.Build();
 
-			Assert.Contains("IFooService", ex.Message);
+			var service = host.Services.GetService<IFooBarService>();
+
+			var trio = Assert.IsType<FooTrioConstructor>(service);
+			Assert.IsType<FooService>(trio.Foo);
+			Assert.Null(trio.Bar);
+			Assert.Null(trio.Cat);
+			Assert.Equal("(Foo)", trio.Option);
+		}
+
+		[Fact]
+		public void GetServiceHandlesUsesCorrectCtor_FooBar()
+		{
+			var host = new AppHostBuilder()
+				.UseMauiServiceProviderFactory(true)
+				.ConfigureServices((ctx, services) =>
+				{
+					services.AddTransient<IFooService, FooService>();
+					services.AddTransient<IBarService, BarService>();
+					services.AddTransient<IFooBarService, FooTrioConstructor>();
+				})
+				.Build();
+
+			var service = host.Services.GetService<IFooBarService>();
+
+			var trio = Assert.IsType<FooTrioConstructor>(service);
+			Assert.IsType<FooService>(trio.Foo);
+			Assert.IsType<BarService>(trio.Bar);
+			Assert.Null(trio.Cat);
+			Assert.Equal("(Foo, Bar)", trio.Option);
+		}
+
+		[Fact]
+		public void GetServiceHandlesUsesCorrectCtor_FooBarCat()
+		{
+			var host = new AppHostBuilder()
+				.UseMauiServiceProviderFactory(true)
+				.ConfigureServices((ctx, services) =>
+				{
+					services.AddTransient<IFooService, FooService>();
+					services.AddTransient<IBarService, BarService>();
+					services.AddTransient<ICatService, CatService>();
+					services.AddTransient<IFooBarService, FooTrioConstructor>();
+				})
+				.Build();
+
+			var service = host.Services.GetService<IFooBarService>();
+
+			var trio = Assert.IsType<FooTrioConstructor>(service);
+			Assert.IsType<FooService>(trio.Foo);
+			Assert.IsType<BarService>(trio.Bar);
+			Assert.IsType<CatService>(trio.Cat);
+			Assert.Equal("(Foo, Bar, Cat)", trio.Option);
 		}
 
 		[Fact]
@@ -55,10 +221,11 @@ public void GetServiceCanReturnTypesThatHaveConstructorParams()
 				})
 				.Build();
 
-			var foobar = host.Services.GetService<IFooBarService>();
+			var service = host.Services.GetService<IFooBarService>();
 
-			Assert.NotNull(foobar);
-			Assert.IsType<FooBarService>(foobar);
+			var foobar = Assert.IsType<FooBarService>(service);
+			Assert.IsType<FooService>(foobar.Foo);
+			Assert.IsType<BarService>(foobar.Bar);
 		}
 
 		[Fact]
@@ -123,6 +290,29 @@ public void GetServiceCanReturnTypesThatHaveSystemDefaultValues()
 			Assert.Equal("Default Value", actual.Text);
 		}
 
+		[Fact]
+		public void GetServiceCanReturnEnumerableParams()
+		{
+			var host = new AppHostBuilder()
+				.UseMauiServiceProviderFactory(true)
+				.ConfigureServices((ctx, services) =>
+				{
+					services.AddTransient<IFooService, FooService>();
+					services.AddTransient<IFooService, FooService2>();
+					services.AddTransient<IFooBarService, FooEnumerableService>();
+				})
+				.Build();
+
+			var service = host.Services.GetService<IFooBarService>();
+			var foobar = Assert.IsType<FooEnumerableService>(service);
+
+			var serviceTypes = foobar.Foos
+				.Select(s => s.GetType().FullName)
+				.ToArray();
+			Assert.Contains(typeof(FooService).FullName, serviceTypes);
+			Assert.Contains(typeof(FooService2).FullName, serviceTypes);
+		}
+
 		[Fact]
 		public void WillRetrieveDifferentTransientServices()
 		{
@@ -158,6 +348,49 @@ public void WillRetrieveMixedServices()
 			AssertTransient<IBarService, BarService>(host.Services);
 		}
 
+		[Fact]
+		public void WillRetrieveEnumerables()
+		{
+			var host = new AppHostBuilder()
+				.ConfigureServices((ctx, services) =>
+				{
+					services.AddTransient<IFooService, FooService>();
+					services.AddTransient<IFooService, FooService2>();
+				})
+				.Build();
+
+			var services = host.Services
+				.GetServices<IFooService>()
+				.ToArray();
+			Assert.Equal(2, services.Length);
+
+			var serviceTypes = services
+				.Select(s => s.GetType().FullName)
+				.ToArray();
+			Assert.Contains(typeof(FooService).FullName, serviceTypes);
+			Assert.Contains(typeof(FooService2).FullName, serviceTypes);
+		}
+
+		[Theory]
+		//[InlineData(true)] // TODO: The MAUI provider does not support generic args
+		[InlineData(false)]
+		public void CanCreateLogger(bool ctorInjection)
+		{
+			var host = new AppHostBuilder()
+				.UseMauiServiceProviderFactory(ctorInjection)
+				.ConfigureServices((ctx, services) =>
+				{
+					services.AddLogging(logging => logging.AddConsole());
+				})
+				.Build();
+
+			var factory = host.Services.GetRequiredService<ILoggerFactory>();
+
+			var logger = factory.CreateLogger<HostBuilderServicesTests>();
+
+			Assert.NotNull(logger);
+		}
+
 		static void AssertTransient<TInterface, TConcrete>(IServiceProvider services)
 		{
 			var service1 = services.GetService<TInterface>();
diff --git a/src/Core/tests/UnitTests/Layouts/ConstraintTests.cs b/src/Core/tests/UnitTests/Layouts/ConstraintTests.cs
index cd046ebf8bee..bdb9c9a3b131 100644
--- a/src/Core/tests/UnitTests/Layouts/ConstraintTests.cs
+++ b/src/Core/tests/UnitTests/Layouts/ConstraintTests.cs
@@ -6,22 +6,12 @@ namespace Microsoft.Maui.UnitTests.Layouts
 	[Category(TestCategory.Core, TestCategory.Layout)]
 	public class ConstraintTests
 	{
-		[Theory("When resolving constraints, external constraints take precedence")]
-		[InlineData(100, 200, 100)]
-		[InlineData(100, 100, 100)]
-		[InlineData(100, -1, 100)]
-		public void ExternalWinsOverDesired(double externalConstraint, double desiredLength, double expected)
-		{
-			var resolution = LayoutManager.ResolveConstraints(externalConstraint, desiredLength);
-			Assert.Equal(expected, resolution);
-		}
-
 		[Theory("When resolving constraints, external constraints take precedence")]
 		[InlineData(100, 200, 130, 100)]
 		[InlineData(100, -1, 130, 100)]
-		public void ExternalWinsOverDesiredAndMeasured(double externalConstraint, double desiredLength, double measured, double expected)
+		public void ExternalWinsOverDesiredAndMeasured(double externalConstraint, double explicitLength, double measured, double expected)
 		{
-			var resolution = LayoutManager.ResolveConstraints(externalConstraint, desiredLength, measured);
+			var resolution = LayoutManager.ResolveConstraints(externalConstraint, explicitLength, measured);
 			Assert.Equal(expected, resolution);
 		}
 
diff --git a/src/Core/tests/UnitTests/LifecycleEvents/LifecycleEventsTests.cs b/src/Core/tests/UnitTests/LifecycleEvents/LifecycleEventsTests.cs
index e41be03aa34e..1350706399ee 100644
--- a/src/Core/tests/UnitTests/LifecycleEvents/LifecycleEventsTests.cs
+++ b/src/Core/tests/UnitTests/LifecycleEvents/LifecycleEventsTests.cs
@@ -3,7 +3,7 @@
 using Microsoft.Maui.LifecycleEvents;
 using Xunit;
 
-namespace Microsoft.Maui.UnitTests
+namespace Microsoft.Maui.UnitTests.LifecycleEvents
 {
 	[Category(TestCategory.Core, TestCategory.Lifecycle)]
 	public class LifecycleEventsTests
diff --git a/src/Core/tests/UnitTests/PropertyMapperTests.cs b/src/Core/tests/UnitTests/PropertyMapperTests.cs
index 551bce13a695..fc54606a5d54 100644
--- a/src/Core/tests/UnitTests/PropertyMapperTests.cs
+++ b/src/Core/tests/UnitTests/PropertyMapperTests.cs
@@ -16,12 +16,12 @@ public void ChainingMappersOverrideBase()
 			bool wasMapper2Called = false;
 			var mapper1 = new PropertyMapper<IView>
 			{
-				[nameof(IView.BackgroundColor)] = (r, v) => wasMapper1Called = true
+				[nameof(IView.Background)] = (r, v) => wasMapper1Called = true
 			};
 
 			var mapper2 = new PropertyMapper<IButton>(mapper1)
 			{
-				[nameof(IView.BackgroundColor)] = (r, v) => wasMapper2Called = true
+				[nameof(IView.Background)] = (r, v) => wasMapper2Called = true
 			};
 
 			mapper2.UpdateProperties(null, new Button());
@@ -37,7 +37,7 @@ public void ChainingMappersWorks()
 			bool wasMapper2Called = false;
 			var mapper1 = new PropertyMapper<IView>
 			{
-				[nameof(IView.BackgroundColor)] = (r, v) => wasMapper1Called = true
+				[nameof(IView.Background)] = (r, v) => wasMapper1Called = true
 			};
 
 			var mapper2 = new PropertyMapper<IButton>(mapper1)
@@ -59,7 +59,7 @@ public void ChainingMappersStillAllowReplacingChainedRoot()
 			bool wasMapper3Called = false;
 			var mapper1 = new PropertyMapper<IView>
 			{
-				[nameof(IView.BackgroundColor)] = (r, v) => wasMapper1Called = true
+				[nameof(IView.Background)] = (r, v) => wasMapper1Called = true
 			};
 
 			var mapper2 = new PropertyMapper<IButton>(mapper1)
@@ -67,7 +67,7 @@ public void ChainingMappersStillAllowReplacingChainedRoot()
 				[nameof(IButton.TextColor)] = (r, v) => wasMapper2Called = true
 			};
 
-			mapper1[nameof(IView.BackgroundColor)] = (r, v) => wasMapper3Called = true;
+			mapper1[nameof(IView.Background)] = (r, v) => wasMapper3Called = true;
 
 			mapper2.UpdateProperties(null, new Button());
 
@@ -84,7 +84,7 @@ public void MappersActionsAreNotCalledOnUpdateProperties()
 			const string mapperActionKey = "Fire";
 			var mapper1 = new PropertyMapper<IView>
 			{
-				[nameof(IView.BackgroundColor)] = (r, v) => wasMapper1Called = true,
+				[nameof(IView.Background)] = (r, v) => wasMapper1Called = true,
 				Actions = {
 					[mapperActionKey] = (r, v) => mapperActionWasCalled = true,
 				}
@@ -107,7 +107,7 @@ public void ChainedMapperActionsRespectNewUpdate()
 			const string mapperActionKey = "Fire";
 			var mapper1 = new PropertyMapper<IView>
 			{
-				[nameof(IView.BackgroundColor)] = (r, v) => wasMapper1Called = true,
+				[nameof(IView.Background)] = (r, v) => wasMapper1Called = true,
 				Actions = {
 					[mapperActionKey] = (r, v) => mapperActionWasCalled = true,
 				}
@@ -133,8 +133,6 @@ public void ChainedMapperActionsRespectNewUpdate()
 			Assert.True(wasMapper2Called);
 		}
 
-
-
 		[Fact]
 		public void GenericMappersWorks()
 		{
@@ -142,7 +140,7 @@ public void GenericMappersWorks()
 			bool wasMapper2Called = false;
 			var mapper1 = new PropertyMapper<IView, IViewHandler>
 			{
-				[nameof(IView.BackgroundColor)] = (r, v) => wasMapper1Called = true
+				[nameof(IView.Background)] = (r, v) => wasMapper1Called = true
 			};
 
 			var mapper2 = new PropertyMapper<IButton, ButtonHandler>(mapper1)
diff --git a/src/Core/tests/UnitTests/TestClasses/AlternateButtonHandlerStub.cs b/src/Core/tests/UnitTests/TestClasses/AlternateButtonHandlerStub.cs
new file mode 100644
index 000000000000..e86c9fefd695
--- /dev/null
+++ b/src/Core/tests/UnitTests/TestClasses/AlternateButtonHandlerStub.cs
@@ -0,0 +1,9 @@
+using Microsoft.Maui.Handlers;
+
+namespace Microsoft.Maui.UnitTests
+{
+	class AlternateButtonHandlerStub : ButtonHandler
+	{
+
+	}
+}
\ No newline at end of file
diff --git a/src/Core/tests/UnitTests/TestClasses/ApplicationStub.cs b/src/Core/tests/UnitTests/TestClasses/ApplicationStub.cs
index d7c77c6afdbe..034382951aab 100644
--- a/src/Core/tests/UnitTests/TestClasses/ApplicationStub.cs
+++ b/src/Core/tests/UnitTests/TestClasses/ApplicationStub.cs
@@ -1,7 +1,11 @@
+using System.Collections.Generic;
+
 namespace Microsoft.Maui.UnitTests
 {
 	class ApplicationStub : IApplication
 	{
+		List<IWindow> _windows = new List<IWindow>();
+		public IReadOnlyList<IWindow> Windows => _windows.AsReadOnly();
 		public string Property { get; set; } = "Default";
 
 		public IWindow CreateWindow(IActivationState activationState)
diff --git a/src/Core/tests/UnitTests/TestClasses/ImageSourceStub.cs b/src/Core/tests/UnitTests/TestClasses/ImageSourceStub.cs
new file mode 100644
index 000000000000..62653d24175c
--- /dev/null
+++ b/src/Core/tests/UnitTests/TestClasses/ImageSourceStub.cs
@@ -0,0 +1,23 @@
+using Microsoft.Maui.Graphics;
+
+namespace Microsoft.Maui.UnitTests
+{
+	class ImageSourceStub : IImageSource
+	{
+		public bool IsEmpty { get; set; }
+	}
+
+	class FileImageSourceStub : ImageSourceStub, IFileImageSource
+	{
+		public string File { get; set; }
+	}
+
+	class FontImageSourceStub : ImageSourceStub, IFontImageSource
+	{
+		public Color Color { get; set; }
+
+		public Font Font { get; set; }
+
+		public string Glyph { get; set; }
+	}
+}
\ No newline at end of file
diff --git a/src/Core/tests/UnitTests/TestClasses/TestServices.cs b/src/Core/tests/UnitTests/TestClasses/TestServices.cs
index 992f4a5e36d8..63d372062a10 100644
--- a/src/Core/tests/UnitTests/TestClasses/TestServices.cs
+++ b/src/Core/tests/UnitTests/TestClasses/TestServices.cs
@@ -10,6 +10,10 @@ interface IBarService
 	{
 	}
 
+	interface ICatService
+	{
+	}
+
 	interface IFooBarService
 	{
 	}
@@ -18,10 +22,35 @@ class FooService : IFooService
 	{
 	}
 
+	class BadFooService : IFooService
+	{
+		private BadFooService()
+		{
+		}
+	}
+
+	class FooService2 : IFooService
+	{
+	}
+
 	class BarService : IBarService
 	{
 	}
 
+	class CatService : ICatService
+	{
+	}
+
+	class FooEnumerableService : IFooBarService
+	{
+		public FooEnumerableService(IEnumerable<IFooService> foos)
+		{
+			Foos = foos;
+		}
+
+		public IEnumerable<IFooService> Foos { get; }
+	}
+
 	class FooBarService : IFooBarService
 	{
 		public FooBarService(IFooService foo, IBarService bar)
@@ -35,6 +64,43 @@ public FooBarService(IFooService foo, IBarService bar)
 		public IBarService Bar { get; }
 	}
 
+	class FooTrioConstructor : IFooBarService
+	{
+		public FooTrioConstructor()
+		{
+			Option = "()";
+		}
+
+		public FooTrioConstructor(IFooService foo)
+		{
+			Foo = foo;
+			Option = "(Foo)";
+		}
+
+		public FooTrioConstructor(IFooService foo, IBarService bar)
+		{
+			Foo = foo;
+			Bar = bar;
+			Option = "(Foo, Bar)";
+		}
+
+		public FooTrioConstructor(IFooService foo, IBarService bar, ICatService cat)
+		{
+			Foo = foo;
+			Bar = bar;
+			Cat = cat;
+			Option = "(Foo, Bar, Cat)";
+		}
+
+		public IFooService Foo { get; }
+
+		public IBarService Bar { get; }
+
+		public ICatService Cat { get; }
+
+		public string Option { get; }
+	}
+
 	class FooDualConstructor : IFooBarService
 	{
 		public FooDualConstructor(IFooService foo)
diff --git a/src/Core/tests/UnitTests/TestClasses/ViewStub.cs b/src/Core/tests/UnitTests/TestClasses/ViewStub.cs
index e375f4989e17..036e137cccc4 100644
--- a/src/Core/tests/UnitTests/TestClasses/ViewStub.cs
+++ b/src/Core/tests/UnitTests/TestClasses/ViewStub.cs
@@ -1,4 +1,3 @@
-using System;
 using Microsoft.Maui.Graphics;
 using Microsoft.Maui.Primitives;
 
@@ -6,56 +5,47 @@ namespace Microsoft.Maui.UnitTests
 {
 	class ViewStub : IViewStub
 	{
-		public bool IsEnabled => throw new NotImplementedException();
+		public bool IsEnabled { get; set; }
 
-		public Color BackgroundColor => throw new NotImplementedException();
+		public Visibility Visibility { get; set; }
 
-		public Rectangle Frame => throw new NotImplementedException();
+		public double Opacity { get; set; }
 
-		public IViewHandler Handler { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+		public Rectangle Frame { get; set; }
 
-		public IFrameworkElement Parent => throw new NotImplementedException();
+		public IViewHandler Handler { get; set; }
 
-		public Size DesiredSize => throw new NotImplementedException();
+		public IFrameworkElement Parent { get; set; }
 
-		public bool IsMeasureValid => throw new NotImplementedException();
+		public Size DesiredSize { get; set; }
 
-		public bool IsArrangeValid => throw new NotImplementedException();
+		public bool IsMeasureValid { get; set; }
 
-		public double Width => throw new NotImplementedException();
+		public bool IsArrangeValid { get; set; }
 
-		public double Height => throw new NotImplementedException();
+		public double Width { get; set; }
 
-		public Thickness Margin => throw new NotImplementedException();
+		public double Height { get; set; }
+		public Thickness Margin { get; set; }
+		public string AutomationId { get; set; }
 
-		public string AutomationId => throw new NotImplementedException();
-
-		public FlowDirection FlowDirection => throw new NotImplementedException();
+		public FlowDirection FlowDirection { get; set; }
 
 		public LayoutAlignment HorizontalLayoutAlignment { get; set; }
 
 		public LayoutAlignment VerticalLayoutAlignment { get; set; }
 
-		public Semantics Semantics { get; set; } = new Semantics();
+		public Semantics Semantics { get; set; }
+
+		public Paint Background { get; set; }
 
-		public Size Arrange(Rectangle bounds)
-		{
-			throw new NotImplementedException();
-		}
+		public Size Arrange(Rectangle bounds) => Size.Zero;
 
-		public void InvalidateArrange()
-		{
-			throw new NotImplementedException();
-		}
+		public void InvalidateArrange() { }
 
-		public void InvalidateMeasure()
-		{
-			throw new NotImplementedException();
-		}
+		public void InvalidateMeasure() { }
 
-		public Size Measure(double widthConstraint, double heightConstraint)
-		{
-			throw new NotImplementedException();
-		}
+		public Size Measure(double widthConstraint, double heightConstraint) =>
+			Size.Zero;
 	}
 }
diff --git a/src/DotNet/Dependencies/Packs.csproj b/src/DotNet/Dependencies/Packs.csproj
index 19ea0b6c64c2..7aab1682c64d 100644
--- a/src/DotNet/Dependencies/Packs.csproj
+++ b/src/DotNet/Dependencies/Packs.csproj
@@ -11,5 +11,10 @@
     <PackageDownload Include="Microsoft.MacCatalyst.Sdk"        Version="[$(MicrosoftMacCatalystSdkPackageVersion)]" />
     <PackageDownload Include="Microsoft.iOS.Ref"                Version="[$(MicrosoftiOSSdkPackageVersion)]" />
     <PackageDownload Include="Microsoft.iOS.Sdk"                Version="[$(MicrosoftiOSSdkPackageVersion)]" />
+    <PackageDownload Include="Microsoft.iOS.Windows.Sdk"        Version="[$(MicrosoftiOSSdkPackageVersion)]" Condition="$([MSBuild]::IsOSPlatform('windows'))" />
+    <PackageDownload Include="Microsoft.tvOS.Ref"               Version="[$(MicrosofttvOSSdkPackageVersion)]" />
+    <PackageDownload Include="Microsoft.tvOS.Sdk"               Version="[$(MicrosofttvOSSdkPackageVersion)]" />
+    <PackageDownload Include="Microsoft.macOS.Ref"              Version="[$(MicrosoftmacOSSdkPackageVersion)]" />
+    <PackageDownload Include="Microsoft.macOS.Sdk"              Version="[$(MicrosoftmacOSSdkPackageVersion)]" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/DotNet/Dependencies/Workloads.csproj b/src/DotNet/Dependencies/Workloads.csproj
index 24d622863029..8756a6952f4a 100644
--- a/src/DotNet/Dependencies/Workloads.csproj
+++ b/src/DotNet/Dependencies/Workloads.csproj
@@ -3,8 +3,10 @@
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageDownload Include="Microsoft.NET.Workload.Android"     Version="[$(MicrosoftAndroidSdkWindowsPackageVersion)]" />
-    <PackageDownload Include="Microsoft.NET.Workload.MacCatalyst" Version="[$(MicrosoftMacCatalystSdkPackageVersion)]" />
-    <PackageDownload Include="Microsoft.NET.Workload.iOS"         Version="[$(MicrosoftiOSSdkPackageVersion)]" />
+    <PackageDownload Include="Microsoft.NET.Sdk.Android.Manifest-$(DotNetPreviewVersionBand)"     Version="[$(MicrosoftAndroidSdkWindowsPackageVersion)]" />
+    <PackageDownload Include="Microsoft.NET.Sdk.MacCatalyst.Manifest-$(DotNetPreviewVersionBand)" Version="[$(MicrosoftMacCatalystSdkPackageVersion)]" />
+    <PackageDownload Include="Microsoft.NET.Sdk.iOS.Manifest-$(DotNetPreviewVersionBand)"         Version="[$(MicrosoftiOSSdkPackageVersion)]" />
+    <PackageDownload Include="Microsoft.NET.Sdk.tvOS.Manifest-$(DotNetPreviewVersionBand)"        Version="[$(MicrosofttvOSSdkPackageVersion)]" />
+    <PackageDownload Include="Microsoft.NET.Sdk.macOS.Manifest-$(DotNetPreviewVersionBand)"       Version="[$(MicrosoftmacOSSdkPackageVersion)]" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/DotNet/DotNet.csproj b/src/DotNet/DotNet.csproj
index a33a973dcc62..0044745eff6a 100644
--- a/src/DotNet/DotNet.csproj
+++ b/src/DotNet/DotNet.csproj
@@ -2,24 +2,18 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <IsPackable>false</IsPackable>
-    <MauiOutputPath>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)../../bin/'))</MauiOutputPath>
-    <DotNetDirectory>$(MauiOutputPath)dotnet/</DotNetDirectory>
-    <DotNetToolPath>$(DotNetDirectory)dotnet</DotNetToolPath>
-    <DotNetPacksDirectory>$(DotNetDirectory)packs/</DotNetPacksDirectory>
-    <DotNetSdkManifestsDirectory>$(DotNetDirectory)sdk-manifests/$(MicrosoftDotnetSdkInternalPackageVersion.Split('-')[0])/</DotNetSdkManifestsDirectory>
-    <DotNetSentinelPath>$(DotNetDirectory)sdk/$(MicrosoftDotnetSdkInternalPackageVersion)/EnableWorkloadResolver.sentinel</DotNetSentinelPath>
   </PropertyGroup>
   <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('windows'))">
     <DotNetInstallScriptUrl>https://dot.net/v1/dotnet-install.ps1</DotNetInstallScriptUrl>
     <DotNetInstallScriptName>dotnet-install.ps1</DotNetInstallScriptName>
-    <DotNetInstallScriptPath>$(MauiOutputPath)$(DotNetInstallScriptName)</DotNetInstallScriptPath>
+    <DotNetInstallScriptPath>$(DotNetOutputPath)$(DotNetInstallScriptName)</DotNetInstallScriptPath>
     <DotNetInstallCommand>&amp; '$(DotNetInstallScriptPath)' -Version $(MicrosoftDotnetSdkInternalPackageVersion) -InstallDir '$(DotNetDirectory)' -Verbose</DotNetInstallCommand>
     <DotNetInstallCommand>powershell -Command &quot;$(DotNetInstallCommand)&quot;</DotNetInstallCommand>
   </PropertyGroup>
   <PropertyGroup Condition="$([MSBuild]::IsOSPlatform('osx'))">
     <DotNetInstallScriptUrl>https://dot.net/v1/dotnet-install.sh</DotNetInstallScriptUrl>
     <DotNetInstallScriptName>dotnet-install.sh</DotNetInstallScriptName>
-    <DotNetInstallScriptPath>$(MauiOutputPath)$(DotNetInstallScriptName)</DotNetInstallScriptPath>
+    <DotNetInstallScriptPath>$(DotNetOutputPath)$(DotNetInstallScriptName)</DotNetInstallScriptPath>
     <DotNetInstallCommand>sh '$(DotNetInstallScriptPath)' --version $(MicrosoftDotnetSdkInternalPackageVersion) --install-dir '$(DotNetDirectory)' --verbose</DotNetInstallCommand>
   </PropertyGroup>
 
@@ -29,7 +23,6 @@
       _InstallDotNet;
       _AcquireWorkloads;
       _AcquirePacks;
-      _CreateWorkloadSentinel;
     </_ProvisionDependsOn>
   </PropertyGroup>
   <Target Name="_Provision" BeforeTargets="Build" DependsOnTargets="$(_ProvisionDependsOn)" />
@@ -47,7 +40,7 @@
       Outputs="$(DotNetInstallScriptPath)">
     <DownloadFile
         SourceUrl="$(DotNetInstallScriptUrl)"
-        DestinationFolder="$(MauiOutputPath)"
+        DestinationFolder="$(DotNetOutputPath)"
         DestinationFileName="$(DotNetInstallScriptName)"
     />
   </Target>
@@ -61,30 +54,63 @@
   </Target>
 
   <ItemGroup>
-    <!-- These are extra packs that get extracted that should be deleted -->
-    <_PacksToRemove Include="microsoft.build.notargets" />
-    <_PacksToRemove Include="microsoft.netcore.platforms" />
-    <_PacksToRemove Include="netstandard.library" />
+    <!-- These are past workload names -->
+    <_PacksToRemove Include="Microsoft.NET.Workload.Android" />
+    <_PacksToRemove Include="Microsoft.NET.Workload.MacCatalyst" />
+    <_PacksToRemove Include="Microsoft.NET.Workload.iOS" />
+    <_PacksToRemove Include="Microsoft.NET.Workload.tvOS" />
+    <_PacksToRemove Include="Microsoft.NET.Workload.macOS" />
   </ItemGroup>
 
   <Target Name="_AcquireWorkloads"
       Inputs="$(_Inputs);Dependencies/Workloads.csproj"
       Outputs="$(DotNetSdkManifestsDirectory).stamp">
+    <RemoveDir Directories="@(_PacksToRemove->'$(DotNetSdkManifestsDirectory)%(Identity)')" />
     <Exec
         Command="&quot;$(DotNetToolPath)&quot; restore &quot;$(MSBuildThisFileDirectory)Dependencies/Workloads.csproj&quot; -bl:$(PackageOutputPath)/DotNetWorkloads.binlog"
-        EnvironmentVariables="NUGET_PACKAGES=$(DotNetSdkManifestsDirectory);DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1"
+        EnvironmentVariables="NUGET_PACKAGES=$(DotNetTempDirectory);DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1"
     />
     <!--
-      NOTE: Workloads need to go in dotnet/sdk-manifests/6.0.100/Microsoft.Workload.NET.*/
-      Workloads only contain two files: WorkloadManifest.targets & WorkloadManifest.json
-      We have to move everything up one directory, for things to land in the right location.
+      NOTE: Workloads need to go in dotnet/sdk-manifests/6.0.100/Microsoft.NET.*/
+      Workloads only contain two files: data/WorkloadManifest.targets & data/WorkloadManifest.json
+      We downloaded these to $(DotNetTempDirectory), so we could move files individually.
     -->
     <ItemGroup>
-      <_WorkloadFiles Include="$(DotNetSdkManifestsDirectory)Microsoft.NET.Workload.*/*/WorkloadManifest.*" />
-      <_WorkloadDirectoriesToDelete Include="@(_WorkloadFiles->'%(RootDir)%(Directory)'->Distinct())" />
+      <_WorkloadFiles Include="$(DotNetTempDirectory)Microsoft.NET.*/*/data/WorkloadManifest.*" />
     </ItemGroup>
-    <Copy SourceFiles="@(_WorkloadFiles)" DestinationFiles="@(_WorkloadFiles->'%(RootDir)%(Directory)../%(FileName)%(Extension)')" />
-    <RemoveDir Directories="@(_WorkloadDirectoriesToDelete);@(_PacksToRemove->'$(DotNetSdkManifestsDirectory)%(Identity)')" />
+    <CopyWorkloadFiles
+        Files="@(_WorkloadFiles)"
+        WorkloadDirectory="$(DotNetSdkManifestsDirectory)"
+        VersionBand="$(DotNetPreviewVersionBand)"
+    />
+
+    <!-- In order to support older MSBuild versions, change the version string to an integer -->
+    <ReplaceText
+        Input="$(DotNetSdkManifestsDirectory)microsoft.net.sdk.android/WorkloadManifest.json"
+        OldValue="&quot;version&quot;: &quot;$(MicrosoftAndroidSdkWindowsPackageVersion)&quot;"
+        NewValue="&quot;version&quot;: 6"
+    />
+    <ReplaceText
+        Input="$(DotNetSdkManifestsDirectory)microsoft.net.sdk.maccatalyst/WorkloadManifest.json"
+        OldValue="&quot;version&quot;: &quot;$(MicrosoftMacCatalystSdkPackageVersion)&quot;"
+        NewValue="&quot;version&quot;: 6"
+    />
+    <ReplaceText
+        Input="$(DotNetSdkManifestsDirectory)microsoft.net.sdk.ios/WorkloadManifest.json"
+        OldValue="&quot;version&quot;: &quot;$(MicrosoftiOSSdkPackageVersion)&quot;"
+        NewValue="&quot;version&quot;: 6"
+    />
+    <ReplaceText
+        Input="$(DotNetSdkManifestsDirectory)microsoft.net.sdk.tvos/WorkloadManifest.json"
+        OldValue="&quot;version&quot;: &quot;$(MicrosofttvOSSdkPackageVersion)&quot;"
+        NewValue="&quot;version&quot;: 6"
+    />
+    <ReplaceText
+        Input="$(DotNetSdkManifestsDirectory)microsoft.net.sdk.macos/WorkloadManifest.json"
+        OldValue="&quot;version&quot;: &quot;$(MicrosoftmacOSSdkPackageVersion)&quot;"
+        NewValue="&quot;version&quot;: 6"
+    />
+
     <Touch Files="$(DotNetSdkManifestsDirectory).stamp" AlwaysCreate="true" />
   </Target>
 
@@ -99,10 +125,50 @@
     <Touch Files="$(DotNetPacksDirectory).stamp" AlwaysCreate="true" />
   </Target>
 
-  <Target Name="_CreateWorkloadSentinel"
-      Inputs="$(_Inputs)"
-      Outputs="$(DotNetSentinelPath)">
-    <Touch Files="$(DotNetSentinelPath)" AlwaysCreate="true" />
-  </Target>
+  <UsingTask TaskName="CopyWorkloadFiles"
+      TaskFactory="RoslynCodeTaskFactory"
+      AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
+    <ParameterGroup>
+      <Files ParameterType="System.String[]" Required="true" />
+      <WorkloadDirectory ParameterType="System.String" Required="true" />
+      <VersionBand ParameterType="System.String" Required="true" />
+    </ParameterGroup>
+    <Task>
+      <Using Namespace="System.IO" />
+      <Code Type="Fragment" Language="cs">
+        <![CDATA[
+          // This is only in C#, because the equivalent MSBuild XML would not be pretty.
+          foreach (var file in Files)
+          {
+              var name = Directory.GetParent (file).Parent.Parent.Name;
+              var directory = Path.Combine(WorkloadDirectory, name.Replace($".manifest-{VersionBand}", ""));
+              Directory.CreateDirectory(directory);
+              var destination = Path.Combine(directory, Path.GetFileName(file));
+              Log.LogMessage($"Copying {file} to {destination}");
+              File.Copy(file, destination, overwrite: true);
+          }
+        ]]>
+      </Code>
+    </Task>
+  </UsingTask>
+  <UsingTask TaskName="ReplaceText"
+      TaskFactory="RoslynCodeTaskFactory"
+      AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
+    <ParameterGroup>
+      <Input ParameterType="System.String" Required="true" />
+      <OldValue ParameterType="System.String" Required="true" />
+      <NewValue ParameterType="System.String" Required="true" />
+    </ParameterGroup>
+    <Task>
+      <Using Namespace="System.IO" />
+      <Using Namespace="System.Text.RegularExpressions" />
+      <Code Type="Fragment" Language="cs">
+        <![CDATA[
+          var regex = new Regex(Regex.Escape(OldValue));
+          File.WriteAllText(Input, regex.Replace(File.ReadAllText(Input), NewValue, count: 1));
+        ]]>
+      </Code>
+    </Task>
+  </UsingTask>
 
 </Project>
\ No newline at end of file
diff --git a/src/Essentials/src/AppActions/AppActions.android.cs b/src/Essentials/src/AppActions/AppActions.android.cs
index baf36949cc5f..e9e832ec989e 100644
--- a/src/Essentials/src/AppActions/AppActions.android.cs
+++ b/src/Essentials/src/AppActions/AppActions.android.cs
@@ -18,7 +18,7 @@ static Task<IEnumerable<AppAction>> PlatformGetAsync()
 				throw new FeatureNotSupportedException();
 
 #if __ANDROID_25__
-            return Task.FromResult(Platform.ShortcutManager.DynamicShortcuts.Select(s => s.ToAppAction()));
+			return Task.FromResult(Platform.ShortcutManager.DynamicShortcuts.Select(s => s.ToAppAction()));
 #else
 			return Task.FromResult < IEnumerable < AppAction >>> (null);
 #endif
@@ -30,7 +30,7 @@ static Task PlatformSetAsync(IEnumerable<AppAction> actions)
 				throw new FeatureNotSupportedException();
 
 #if __ANDROID_25__
-            Platform.ShortcutManager.SetDynamicShortcuts(actions.Select(a => a.ToShortcutInfo()).ToList());
+			Platform.ShortcutManager.SetDynamicShortcuts(actions.Select(a => a.ToShortcutInfo()).ToList());
 #endif
 			return Task.CompletedTask;
 		}
diff --git a/src/Essentials/src/AppActions/AppActions.uwp.cs b/src/Essentials/src/AppActions/AppActions.uwp.cs
index 1eabe41d3988..707997994a3b 100644
--- a/src/Essentials/src/AppActions/AppActions.uwp.cs
+++ b/src/Essentials/src/AppActions/AppActions.uwp.cs
@@ -28,12 +28,12 @@ internal static async Task OnLaunched(LaunchActivatedEventArgs e)
 		{
 			var args = e?.Arguments;
 #if !WINDOWS_UWP
-            if (string.IsNullOrEmpty(args))
-            {
-                var cliArgs = Environment.GetCommandLineArgs();
-                if (cliArgs?.Length > 1)
-                    args = cliArgs[1];
-            }
+			if (string.IsNullOrEmpty(args))
+			{
+				var cliArgs = Environment.GetCommandLineArgs();
+				if (cliArgs?.Length > 1)
+					args = cliArgs[1];
+			}
 #endif
 
 			if (args?.StartsWith(appActionPrefix) ?? false)
diff --git a/src/Essentials/src/AppInfo/AppInfo.android.cs b/src/Essentials/src/AppInfo/AppInfo.android.cs
index 778b803e062b..7030d25c810b 100644
--- a/src/Essentials/src/AppInfo/AppInfo.android.cs
+++ b/src/Essentials/src/AppInfo/AppInfo.android.cs
@@ -35,7 +35,7 @@ static string PlatformGetBuild()
 			using (var info = pm.GetPackageInfo(packageName, PackageInfoFlags.MetaData))
 			{
 #if __ANDROID_28__
-                return PackageInfoCompat.GetLongVersionCode(info).ToString(CultureInfo.InvariantCulture);
+				return PackageInfoCompat.GetLongVersionCode(info).ToString(CultureInfo.InvariantCulture);
 #else
 #pragma warning disable CS0618 // Type or member is obsolete
 				return info.VersionCode.ToString(CultureInfo.InvariantCulture);
@@ -56,8 +56,8 @@ static void PlatformShowSettingsUI()
 			var flags = ActivityFlags.NewTask | ActivityFlags.NoHistory | ActivityFlags.ExcludeFromRecents;
 
 #if __ANDROID_24__
-            if (Platform.HasApiLevelN)
-                flags |= ActivityFlags.LaunchAdjacent;
+			if (Platform.HasApiLevelN)
+				flags |= ActivityFlags.LaunchAdjacent;
 #endif
 			settingsIntent.SetFlags(flags);
 
diff --git a/src/Essentials/src/AppInfo/AppInfo.ios.tvos.watchos.macos.cs b/src/Essentials/src/AppInfo/AppInfo.ios.tvos.watchos.macos.cs
index c844dd0de035..d359f7f8a4e2 100644
--- a/src/Essentials/src/AppInfo/AppInfo.ios.tvos.watchos.macos.cs
+++ b/src/Essentials/src/AppInfo/AppInfo.ios.tvos.watchos.macos.cs
@@ -24,8 +24,8 @@ static string GetBundleValue(string key)
 		   => NSBundle.MainBundle.ObjectForInfoDictionary(key)?.ToString();
 
 #if __IOS__ || __TVOS__
-        static async void PlatformShowSettingsUI()
-            => await Launcher.OpenAsync(UIApplication.OpenSettingsUrlString);
+		static async void PlatformShowSettingsUI()
+			=> await Launcher.OpenAsync(UIApplication.OpenSettingsUrlString);
 #elif __MACOS__
         static void PlatformShowSettingsUI()
         {
@@ -42,21 +42,21 @@ static void PlatformShowSettingsUI() =>
 #endif
 
 #if __IOS__ || __TVOS__
-        static AppTheme PlatformRequestedTheme()
-        {
-            if (!Platform.HasOSVersion(13, 0))
-                return AppTheme.Unspecified;
+		static AppTheme PlatformRequestedTheme()
+		{
+			if (!Platform.HasOSVersion(13, 0))
+				return AppTheme.Unspecified;
 
-            var uiStyle = Platform.GetCurrentUIViewController()?.TraitCollection?.UserInterfaceStyle ??
-                UITraitCollection.CurrentTraitCollection.UserInterfaceStyle;
+			var uiStyle = Platform.GetCurrentUIViewController()?.TraitCollection?.UserInterfaceStyle ??
+				UITraitCollection.CurrentTraitCollection.UserInterfaceStyle;
 
-            return uiStyle switch
-            {
-                UIUserInterfaceStyle.Light => AppTheme.Light,
-                UIUserInterfaceStyle.Dark => AppTheme.Dark,
-                _ => AppTheme.Unspecified
-            };
-        }
+			return uiStyle switch
+			{
+				UIUserInterfaceStyle.Light => AppTheme.Light,
+				UIUserInterfaceStyle.Dark => AppTheme.Dark,
+				_ => AppTheme.Unspecified
+			};
+		}
 #elif __MACOS__
         static AppTheme PlatformRequestedTheme()
         {
diff --git a/src/Essentials/src/AssemblyInfo/AssemblyInfo.ios.tvos.watchos.macos.cs b/src/Essentials/src/AssemblyInfo/AssemblyInfo.ios.tvos.watchos.macos.cs
index 6e3c37060e18..823126084315 100644
--- a/src/Essentials/src/AssemblyInfo/AssemblyInfo.ios.tvos.watchos.macos.cs
+++ b/src/Essentials/src/AssemblyInfo/AssemblyInfo.ios.tvos.watchos.macos.cs
@@ -1,3 +1,3 @@
-using Foundation;
+using System.Reflection;
 
-[assembly: LinkerSafe]
+[assembly: AssemblyMetadata("IsTrimmable", "True")]
diff --git a/src/Essentials/src/Browser/Browser.android.cs b/src/Essentials/src/Browser/Browser.android.cs
index 87aded012cfa..093a62cee23f 100644
--- a/src/Essentials/src/Browser/Browser.android.cs
+++ b/src/Essentials/src/Browser/Browser.android.cs
@@ -38,13 +38,13 @@ static Task<bool> PlatformOpenAsync(Uri uri, BrowserLaunchOptions options)
 					}
 
 #if __ANDROID_24__
-                    if (Platform.HasApiLevelN && options.HasFlag(BrowserLaunchFlags.LaunchAdjacent))
-                    {
-                        if (tabsFlags.HasValue)
-                            tabsFlags |= ActivityFlags.LaunchAdjacent | ActivityFlags.NewTask;
-                        else
-                            tabsFlags = ActivityFlags.LaunchAdjacent | ActivityFlags.NewTask;
-                    }
+					if (Platform.HasApiLevelN && options.HasFlag(BrowserLaunchFlags.LaunchAdjacent))
+					{
+						if (tabsFlags.HasValue)
+							tabsFlags |= ActivityFlags.LaunchAdjacent | ActivityFlags.NewTask;
+						else
+							tabsFlags = ActivityFlags.LaunchAdjacent | ActivityFlags.NewTask;
+					}
 #endif
 
 					// Check if there's flags specified to use
@@ -58,8 +58,8 @@ static Task<bool> PlatformOpenAsync(Uri uri, BrowserLaunchOptions options)
 					var intent = new Intent(Intent.ActionView, nativeUri);
 					var flags = ActivityFlags.ClearTop | ActivityFlags.NewTask;
 #if __ANDROID_24__
-                    if (Platform.HasApiLevelN && options.HasFlag(BrowserLaunchFlags.LaunchAdjacent))
-                        flags |= ActivityFlags.LaunchAdjacent;
+					if (Platform.HasApiLevelN && options.HasFlag(BrowserLaunchFlags.LaunchAdjacent))
+						flags |= ActivityFlags.LaunchAdjacent;
 #endif
 					intent.SetFlags(flags);
 
diff --git a/src/Essentials/src/Connectivity/Connectivity.ios.tvos.macos.cs b/src/Essentials/src/Connectivity/Connectivity.ios.tvos.macos.cs
index 1fe8a3a1f917..4cb0fc23979b 100644
--- a/src/Essentials/src/Connectivity/Connectivity.ios.tvos.macos.cs
+++ b/src/Essentials/src/Connectivity/Connectivity.ios.tvos.macos.cs
@@ -9,9 +9,9 @@ namespace Microsoft.Maui.Essentials
 	public static partial class Connectivity
 	{
 #if __IOS__
-        static readonly Lazy<CTCellularData> cellularData = new Lazy<CTCellularData>(() => new CTCellularData());
+		static readonly Lazy<CTCellularData> cellularData = new Lazy<CTCellularData>(() => new CTCellularData());
 
-        internal static CTCellularData CellularData => cellularData.Value;
+		internal static CTCellularData CellularData => cellularData.Value;
 #endif
 
 		static ReachabilityListener listener;
@@ -38,7 +38,7 @@ static NetworkAccess PlatformNetworkAccess
 			{
 				var restricted = false;
 #if __IOS__
-                restricted = CellularData.RestrictedState == CTCellularDataRestrictedState.Restricted;
+				restricted = CellularData.RestrictedState == CTCellularDataRestrictedState.Restricted;
 #endif
 				var internetStatus = Reachability.InternetConnectionStatus();
 				if ((internetStatus == NetworkStatus.ReachableViaCarrierDataNetwork && !restricted) || internetStatus == NetworkStatus.ReachableViaWiFiNetwork)
diff --git a/src/Essentials/src/Connectivity/Connectivity.ios.tvos.macos.reachability.cs b/src/Essentials/src/Connectivity/Connectivity.ios.tvos.macos.reachability.cs
index 9701b4227808..3dddb93cb0ab 100644
--- a/src/Essentials/src/Connectivity/Connectivity.ios.tvos.macos.reachability.cs
+++ b/src/Essentials/src/Connectivity/Connectivity.ios.tvos.macos.reachability.cs
@@ -34,8 +34,8 @@ internal static NetworkStatus RemoteHostStatus()
 					return NetworkStatus.NotReachable;
 
 #if __IOS__
-                if ((flags & NetworkReachabilityFlags.IsWWAN) != 0)
-                    return NetworkStatus.ReachableViaCarrierDataNetwork;
+				if ((flags & NetworkReachabilityFlags.IsWWAN) != 0)
+					return NetworkStatus.ReachableViaCarrierDataNetwork;
 #endif
 
 				return NetworkStatus.ReachableViaWiFiNetwork;
@@ -49,9 +49,9 @@ internal static NetworkStatus InternetConnectionStatus()
 			var defaultNetworkAvailable = IsNetworkAvailable(out var flags);
 
 #if __IOS__
-            // If it's a WWAN connection..
-            if ((flags & NetworkReachabilityFlags.IsWWAN) != 0)
-                status = NetworkStatus.ReachableViaCarrierDataNetwork;
+			// If it's a WWAN connection..
+			if ((flags & NetworkReachabilityFlags.IsWWAN) != 0)
+				status = NetworkStatus.ReachableViaCarrierDataNetwork;
 #endif
 
 			// If the connection is reachable and no connection is required, then assume it's WiFi
@@ -78,12 +78,12 @@ internal static IEnumerable<NetworkStatus> GetActiveConnectionType()
 			var defaultNetworkAvailable = IsNetworkAvailable(out var flags);
 
 #if __IOS__
-            // If it's a WWAN connection.
-            if ((flags & NetworkReachabilityFlags.IsWWAN) != 0)
-            {
-                status.Add(NetworkStatus.ReachableViaCarrierDataNetwork);
-            }
-            else if (defaultNetworkAvailable)
+			// If it's a WWAN connection.
+			if ((flags & NetworkReachabilityFlags.IsWWAN) != 0)
+			{
+				status.Add(NetworkStatus.ReachableViaCarrierDataNetwork);
+			}
+			else if (defaultNetworkAvailable)
 #else
 			// If the connection is reachable and no connection is required, then assume it's WiFi
 			if (defaultNetworkAvailable)
@@ -123,10 +123,10 @@ internal static bool IsReachableWithoutRequiringConnection(NetworkReachabilityFl
 			var noConnectionRequired = (flags & NetworkReachabilityFlags.ConnectionRequired) == 0;
 
 #if __IOS__
-            // Since the network stack will automatically try to get the WAN up,
-            // probe that
-            if ((flags & NetworkReachabilityFlags.IsWWAN) != 0)
-                noConnectionRequired = true;
+			// Since the network stack will automatically try to get the WAN up,
+			// probe that
+			if ((flags & NetworkReachabilityFlags.IsWWAN) != 0)
+				noConnectionRequired = true;
 #endif
 
 			return isReachable && noConnectionRequired;
@@ -155,7 +155,7 @@ internal ReachabilityListener()
 			remoteHostReachability.Schedule(CFRunLoop.Main, CFRunLoop.ModeDefault);
 
 #if __IOS__
-            Connectivity.CellularData.RestrictionDidUpdateNotifier = new Action<CTCellularDataRestrictedState>(OnRestrictedStateChanged);
+			Connectivity.CellularData.RestrictionDidUpdateNotifier = new Action<CTCellularDataRestrictedState>(OnRestrictedStateChanged);
 #endif
 		}
 
@@ -171,15 +171,15 @@ internal void Dispose()
 			remoteHostReachability = null;
 
 #if __IOS__
-            Connectivity.CellularData.RestrictionDidUpdateNotifier = null;
+			Connectivity.CellularData.RestrictionDidUpdateNotifier = null;
 #endif
 		}
 
 #if __IOS__
-        void OnRestrictedStateChanged(CTCellularDataRestrictedState state)
-        {
-            ReachabilityChanged?.Invoke();
-        }
+		void OnRestrictedStateChanged(CTCellularDataRestrictedState state)
+		{
+			ReachabilityChanged?.Invoke();
+		}
 #endif
 
 		async void OnChange(NetworkReachabilityFlags flags)
diff --git a/src/Essentials/src/Contacts/Contacts.ios.macos.cs b/src/Essentials/src/Contacts/Contacts.ios.macos.cs
index 84fe798a4581..e73d943b0cfb 100644
--- a/src/Essentials/src/Contacts/Contacts.ios.macos.cs
+++ b/src/Essentials/src/Contacts/Contacts.ios.macos.cs
@@ -16,33 +16,33 @@ public static partial class Contacts
         static Task<Contact> PlatformPickContactAsync() => throw ExceptionUtils.NotSupportedOrImplementedException;
 
 #elif __IOS__
-        static Task<Contact> PlatformPickContactAsync()
-        {
-            var uiView = Platform.GetCurrentViewController();
-            if (uiView == null)
-                throw new ArgumentNullException($"The View Controller can't be null.");
-
-            var source = new TaskCompletionSource<Contact>();
-
-            var picker = new CNContactPickerViewController
-            {
-                Delegate = new ContactPickerDelegate(phoneContact =>
-                {
-                    try
-                    {
-                        source?.TrySetResult(ConvertContact(phoneContact));
-                    }
-                    catch (Exception ex)
-                    {
-                        source?.TrySetException(ex);
-                    }
-                })
-            };
-
-            uiView.PresentViewController(picker, true, null);
-
-            return source.Task;
-        }
+		static Task<Contact> PlatformPickContactAsync()
+		{
+			var uiView = Platform.GetCurrentViewController();
+			if (uiView == null)
+				throw new ArgumentNullException($"The View Controller can't be null.");
+
+			var source = new TaskCompletionSource<Contact>();
+
+			var picker = new CNContactPickerViewController
+			{
+				Delegate = new ContactPickerDelegate(phoneContact =>
+				{
+					try
+					{
+						source?.TrySetResult(ConvertContact(phoneContact));
+					}
+					catch (Exception ex)
+					{
+						source?.TrySetException(ex);
+					}
+				})
+			};
+
+			uiView.PresentViewController(picker, true, null);
+
+			return source.Task;
+		}
 
 #endif
 		static Task<IEnumerable<Contact>> PlatformGetAllAsync(CancellationToken cancellationToken)
@@ -106,33 +106,33 @@ internal static Contact ConvertContact(CNContact contact)
 		}
 
 #if __IOS__
-        class ContactPickerDelegate : CNContactPickerDelegate
-        {
-            public ContactPickerDelegate(Action<CNContact> didSelectContactHandler) =>
-                DidSelectContactHandler = didSelectContactHandler;
-
-            public ContactPickerDelegate(IntPtr handle)
-                : base(handle)
-            {
-            }
-
-            public Action<CNContact> DidSelectContactHandler { get; }
-
-            public override void ContactPickerDidCancel(CNContactPickerViewController picker)
-            {
-                DidSelectContactHandler?.Invoke(default);
-                picker.DismissModalViewController(true);
-            }
-
-            public override void DidSelectContact(CNContactPickerViewController picker, CNContact contact)
-            {
-                DidSelectContactHandler?.Invoke(contact);
-                picker.DismissModalViewController(true);
-            }
-
-            public override void DidSelectContactProperty(CNContactPickerViewController picker, CNContactProperty contactProperty) =>
-                picker.DismissModalViewController(true);
-        }
+		class ContactPickerDelegate : CNContactPickerDelegate
+		{
+			public ContactPickerDelegate(Action<CNContact> didSelectContactHandler) =>
+				DidSelectContactHandler = didSelectContactHandler;
+
+			public ContactPickerDelegate(IntPtr handle)
+				: base(handle)
+			{
+			}
+
+			public Action<CNContact> DidSelectContactHandler { get; }
+
+			public override void ContactPickerDidCancel(CNContactPickerViewController picker)
+			{
+				DidSelectContactHandler?.Invoke(default);
+				picker.DismissModalViewController(true);
+			}
+
+			public override void DidSelectContact(CNContactPickerViewController picker, CNContact contact)
+			{
+				DidSelectContactHandler?.Invoke(contact);
+				picker.DismissModalViewController(true);
+			}
+
+			public override void DidSelectContactProperty(CNContactPickerViewController picker, CNContactProperty contactProperty) =>
+				picker.DismissModalViewController(true);
+		}
 #endif
 	}
 }
diff --git a/src/Essentials/src/DeviceInfo/DeviceInfo.ios.tvos.watchos.cs b/src/Essentials/src/DeviceInfo/DeviceInfo.ios.tvos.watchos.cs
index ef3a2a0ac84e..83dbd6474d7b 100644
--- a/src/Essentials/src/DeviceInfo/DeviceInfo.ios.tvos.watchos.cs
+++ b/src/Essentials/src/DeviceInfo/DeviceInfo.ios.tvos.watchos.cs
@@ -34,7 +34,7 @@ static string GetModel()
 
 		static DevicePlatform GetPlatform() =>
 #if __IOS__
-            DevicePlatform.iOS;
+			DevicePlatform.iOS;
 #elif __TVOS__
             DevicePlatform.tvOS;
 #elif __WATCHOS__
diff --git a/src/Essentials/src/Email/Email.android.cs b/src/Essentials/src/Email/Email.android.cs
index 7cb39c4ff8a2..eda48e2253dc 100644
--- a/src/Essentials/src/Email/Email.android.cs
+++ b/src/Essentials/src/Email/Email.android.cs
@@ -22,8 +22,8 @@ static Task PlatformComposeAsync(EmailMessage message)
 			var intent = CreateIntent(message);
 			var flags = ActivityFlags.ClearTop | ActivityFlags.NewTask;
 #if __ANDROID_24__
-            if (Platform.HasApiLevelN)
-                flags |= ActivityFlags.LaunchAdjacent;
+			if (Platform.HasApiLevelN)
+				flags |= ActivityFlags.LaunchAdjacent;
 #endif
 			intent.SetFlags(flags);
 
@@ -53,11 +53,11 @@ static Intent CreateIntent(EmailMessage message)
 				{
 					ISpanned html;
 #if __ANDROID_24__
-                    if (Platform.HasApiLevelN)
-                    {
-                        html = Html.FromHtml(message.Body, FromHtmlOptions.ModeLegacy);
-                    }
-                    else
+					if (Platform.HasApiLevelN)
+					{
+						html = Html.FromHtml(message.Body, FromHtmlOptions.ModeLegacy);
+					}
+					else
 #endif
 					{
 #pragma warning disable CS0618 // Type or member is obsolete
diff --git a/src/Essentials/src/Essentials-net6.csproj b/src/Essentials/src/Essentials-net6.csproj
index ee378a31f951..992eb9d5b739 100644
--- a/src/Essentials/src/Essentials-net6.csproj
+++ b/src/Essentials/src/Essentials-net6.csproj
@@ -1,9 +1,10 @@
-<Project Sdk="Microsoft.Net.Sdk">
+<Project Sdk="Microsoft.Net.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netstandard2.0;net6.0;$(MauiPlatforms)</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;netstandard2.0;$(MauiPlatforms)</TargetFrameworks>
     <AssemblyName>Microsoft.Maui.Essentials</AssemblyName>
     <RootNamespace>Microsoft.Maui.Essentials</RootNamespace>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <WarningsNotAsErrors>BI1234</WarningsNotAsErrors>
   </PropertyGroup>
   <PropertyGroup>
     <PackageId>Microsoft.Maui.Essentials</PackageId>
@@ -14,8 +15,6 @@
     <PackageReference Remove="*" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
-    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
     <PackageReference Include="Microsoft.Maui.Graphics" />
     <None Include="..\..\..\LICENSE" PackagePath="" Pack="true" />
     <None Include="..\..\..\Assets\xamarin.essentials_128x128.png" PackagePath="icon.png" Pack="true" />
@@ -23,6 +22,9 @@
     <Compile Include="**\*.shared.cs" />
     <Compile Include="**\*.shared.*.cs" />
   </ItemGroup>
+  <ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">
+    <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
+  </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' OR $(TargetFramework.StartsWith('netstandard'))">
     <Compile Include="**\*.netstandard.cs" />
     <Compile Include="**\*.netstandard.*.cs" />
diff --git a/src/Essentials/src/Essentials.csproj b/src/Essentials/src/Essentials.csproj
index ba1943fe2aed..bb43e548f268 100644
--- a/src/Essentials/src/Essentials.csproj
+++ b/src/Essentials/src/Essentials.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;Xamarin.iOS10;MonoAndroid90;MonoAndroid10.0;tizen40;Xamarin.Mac20;</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);uap10.0.16299;</TargetFrameworks>
+    <TargetFrameworks>$(NonNet6EssentialsPlatforms)</TargetFrameworks>
     <AssemblyName>Microsoft.Maui.Essentials</AssemblyName>
     <RootNamespace>Microsoft.Maui.Essentials</RootNamespace>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
diff --git a/src/Essentials/src/Geolocation/Geolocation.ios.macos.cs b/src/Essentials/src/Geolocation/Geolocation.ios.macos.cs
index 9054de05c673..6cfb8a8bb00c 100644
--- a/src/Essentials/src/Geolocation/Geolocation.ios.macos.cs
+++ b/src/Essentials/src/Geolocation/Geolocation.ios.macos.cs
@@ -45,8 +45,8 @@ static async Task<Location> PlatformLocationAsync(GeolocationRequest request, Ca
 			manager.Delegate = listener;
 
 #if __IOS__
-            // we're only listening for a single update
-            manager.PausesLocationUpdatesAutomatically = false;
+			// we're only listening for a single update
+			manager.PausesLocationUpdatesAutomatically = false;
 #endif
 
 			manager.StartUpdatingLocation();
diff --git a/src/Essentials/src/Launcher/Launcher.android.cs b/src/Essentials/src/Launcher/Launcher.android.cs
index c1116cf9695a..6105709f7b66 100644
--- a/src/Essentials/src/Launcher/Launcher.android.cs
+++ b/src/Essentials/src/Launcher/Launcher.android.cs
@@ -27,8 +27,8 @@ static Task PlatformOpenAsync(Uri uri)
 			var intent = new Intent(Intent.ActionView, AndroidUri.Parse(uri.OriginalString));
 			var flags = ActivityFlags.ClearTop | ActivityFlags.NewTask;
 #if __ANDROID_24__
-            if (Platform.HasApiLevelN)
-                flags |= ActivityFlags.LaunchAdjacent;
+			if (Platform.HasApiLevelN)
+				flags |= ActivityFlags.LaunchAdjacent;
 #endif
 			intent.SetFlags(flags);
 
@@ -47,8 +47,8 @@ static Task PlatformOpenAsync(OpenFileRequest request)
 			var chooserIntent = Intent.CreateChooser(intent, request.Title ?? string.Empty);
 			var flags = ActivityFlags.ClearTop | ActivityFlags.NewTask;
 #if __ANDROID_24__
-            if (Platform.HasApiLevelN)
-                flags |= ActivityFlags.LaunchAdjacent;
+			if (Platform.HasApiLevelN)
+				flags |= ActivityFlags.LaunchAdjacent;
 #endif
 			chooserIntent.SetFlags(flags);
 
diff --git a/src/Essentials/src/MainThread/MainThread.uwp.cs b/src/Essentials/src/MainThread/MainThread.uwp.cs
index 7858de911a2e..14263842ac4c 100644
--- a/src/Essentials/src/MainThread/MainThread.uwp.cs
+++ b/src/Essentials/src/MainThread/MainThread.uwp.cs
@@ -33,7 +33,7 @@ static bool PlatformIsMainThread
 
 				return CoreApplication.MainView.CoreWindow.Dispatcher?.HasThreadAccess ?? false;
 #elif WINDOWS
-                return DispatcherQueue.GetForCurrentThread()?.HasThreadAccess ?? false;
+				return DispatcherQueue.GetForCurrentThread()?.HasThreadAccess ?? false;
 #endif
 			}
 		}
@@ -47,13 +47,13 @@ static void PlatformBeginInvokeOnMainThread(Action action)
 				throw new InvalidOperationException("Unable to find main thread.");
 			dispatcher.RunAsync(CoreDispatcherPriority.Normal, () => action()).WatchForError();
 #elif WINDOWS
-            var dispatcher = DispatcherQueue.GetForCurrentThread();
+			var dispatcher = DispatcherQueue.GetForCurrentThread();
 
-            if (dispatcher == null)
-                throw new InvalidOperationException("Unable to find main thread.");
+			if (dispatcher == null)
+				throw new InvalidOperationException("Unable to find main thread.");
 
-            if (!dispatcher.TryEnqueue(DispatcherQueuePriority.Normal, () => action()))
-                throw new InvalidOperationException("Unable to queue on the main thread.");
+			if (!dispatcher.TryEnqueue(DispatcherQueuePriority.Normal, () => action()))
+				throw new InvalidOperationException("Unable to queue on the main thread.");
 #endif
 		}
 	}
diff --git a/src/Essentials/src/Map/Map.android.cs b/src/Essentials/src/Map/Map.android.cs
index 82ba55aec3cb..d0aa6fc3b9f5 100644
--- a/src/Essentials/src/Map/Map.android.cs
+++ b/src/Essentials/src/Map/Map.android.cs
@@ -66,8 +66,8 @@ static void StartIntent(string uri)
 			var intent = new Intent(Intent.ActionView, AndroidUri.Parse(uri));
 			var flags = ActivityFlags.ClearTop | ActivityFlags.NewTask;
 #if __ANDROID_24__
-            if (Platform.HasApiLevelN)
-                flags |= ActivityFlags.LaunchAdjacent;
+			if (Platform.HasApiLevelN)
+				flags |= ActivityFlags.LaunchAdjacent;
 #endif
 			intent.SetFlags(flags);
 
diff --git a/src/Essentials/src/Map/Map.ios.watchos.macos.cs b/src/Essentials/src/Map/Map.ios.watchos.macos.cs
index 99d61e34abd4..728818141782 100644
--- a/src/Essentials/src/Map/Map.ios.watchos.macos.cs
+++ b/src/Essentials/src/Map/Map.ios.watchos.macos.cs
@@ -23,15 +23,15 @@ internal static Task PlatformOpenMapsAsync(double latitude, double longitude, Ma
 		internal static async Task PlatformOpenMapsAsync(Placemark placemark, MapLaunchOptions options)
 		{
 #if __IOS__
-            var address = new MKPlacemarkAddress
-            {
-                CountryCode = placemark.CountryCode,
-                Country = placemark.CountryName,
-                State = placemark.AdminArea,
-                Street = placemark.Thoroughfare,
-                City = placemark.Locality,
-                Zip = placemark.PostalCode
-            }.Dictionary;
+			var address = new MKPlacemarkAddress
+			{
+				CountryCode = placemark.CountryCode,
+				Country = placemark.CountryName,
+				State = placemark.AdminArea,
+				Street = placemark.Thoroughfare,
+				City = placemark.Locality,
+				Zip = placemark.PostalCode
+			}.Dictionary;
 #else
 			var address = new NSMutableDictionary
 			{
@@ -52,11 +52,11 @@ internal static async Task PlatformOpenMapsAsync(Placemark placemark, MapLaunchO
 			else
 			{
 #if __IOS__ || __MACOS__
-                // https://developer.apple.com/library/archive/featuredarticles/iPhoneURLScheme_Reference/MapLinks/MapLinks.html
-                var uri = $"http://maps.apple.com/?q={placemark.GetEscapedAddress()}";
-                var nsurl = NSUrl.FromString(uri);
+				// https://developer.apple.com/library/archive/featuredarticles/iPhoneURLScheme_Reference/MapLinks/MapLinks.html
+				var uri = $"http://maps.apple.com/?q={placemark.GetEscapedAddress()}";
+				var nsurl = NSUrl.FromString(uri);
 
-                await Launcher.PlatformOpenAsync(nsurl);
+				await Launcher.PlatformOpenAsync(nsurl);
 #else
 				await OpenPlacemark(new MKPlacemark(default, address), options);
 #endif
diff --git a/src/Essentials/src/Permissions/Permissions.android.cs b/src/Essentials/src/Permissions/Permissions.android.cs
index b9cfb735b8aa..4feecd5f98dc 100644
--- a/src/Essentials/src/Permissions/Permissions.android.cs
+++ b/src/Essentials/src/Permissions/Permissions.android.cs
@@ -244,9 +244,9 @@ public override (string androidPermission, bool isRuntime)[] RequiredPermissions
 				{
 					var permissions = new List<(string, bool)>();
 #if __ANDROID_29__
-                    // Check if running and targeting Q
-                    if (Platform.HasApiLevelQ && Platform.AppContext.ApplicationInfo.TargetSdkVersion >= BuildVersionCodes.Q)
-                        permissions.Add((Manifest.Permission.AccessBackgroundLocation, true));
+					// Check if running and targeting Q
+					if (Platform.HasApiLevelQ && Platform.AppContext.ApplicationInfo.TargetSdkVersion >= BuildVersionCodes.Q)
+						permissions.Add((Manifest.Permission.AccessBackgroundLocation, true));
 #endif
 
 					permissions.Add((Manifest.Permission.AccessCoarseLocation, true));
@@ -313,19 +313,19 @@ public override (string androidPermission, bool isRuntime)[] RequiredPermissions
 						permissions.Add((Manifest.Permission.UseSip, true));
 
 #if __ANDROID_26__
-                    if (Platform.HasApiLevelO)
-                    {
-                        if (IsDeclaredInManifest(Manifest.Permission.AnswerPhoneCalls))
-                            permissions.Add((Manifest.Permission.AnswerPhoneCalls, true));
-                    }
+					if (Platform.HasApiLevelO)
+					{
+						if (IsDeclaredInManifest(Manifest.Permission.AnswerPhoneCalls))
+							permissions.Add((Manifest.Permission.AnswerPhoneCalls, true));
+					}
 #endif
 
 #pragma warning disable CS0618 // Type or member is obsolete
 					if (IsDeclaredInManifest(Manifest.Permission.ProcessOutgoingCalls))
 					{
 #if __ANDROID_29__
-                        if (Platform.HasApiLevel(BuildVersionCodes.Q))
-                            System.Diagnostics.Debug.WriteLine($"{Manifest.Permission.ProcessOutgoingCalls} is deprecated in Android 10");
+						if (Platform.HasApiLevel(BuildVersionCodes.Q))
+							System.Diagnostics.Debug.WriteLine($"{Manifest.Permission.ProcessOutgoingCalls} is deprecated in Android 10");
 #endif
 						permissions.Add((Manifest.Permission.ProcessOutgoingCalls, true));
 					}
diff --git a/src/Essentials/src/PhoneDialer/PhoneDialer.android.cs b/src/Essentials/src/PhoneDialer/PhoneDialer.android.cs
index 4bca89e23f8c..01297143c57c 100644
--- a/src/Essentials/src/PhoneDialer/PhoneDialer.android.cs
+++ b/src/Essentials/src/PhoneDialer/PhoneDialer.android.cs
@@ -27,9 +27,9 @@ static void PlatformOpen(string number)
 
 			var phoneNumber = string.Empty;
 #if __ANDROID_24__
-            if (Platform.HasApiLevelN)
-                phoneNumber = PhoneNumberUtils.FormatNumber(number, Java.Util.Locale.GetDefault(Java.Util.Locale.Category.Format).Country);
-            else if (Platform.HasApiLevel(BuildVersionCodes.Lollipop))
+			if (Platform.HasApiLevelN)
+				phoneNumber = PhoneNumberUtils.FormatNumber(number, Java.Util.Locale.GetDefault(Java.Util.Locale.Category.Format).Country);
+			else if (Platform.HasApiLevel(BuildVersionCodes.Lollipop))
 #else
 			if (Platform.HasApiLevel(BuildVersionCodes.Lollipop))
 #endif
@@ -48,8 +48,8 @@ static void PlatformOpen(string number)
 
 			var flags = ActivityFlags.ClearTop | ActivityFlags.NewTask;
 #if __ANDROID_24__
-            if (Platform.HasApiLevelN)
-                flags |= ActivityFlags.LaunchAdjacent;
+			if (Platform.HasApiLevelN)
+				flags |= ActivityFlags.LaunchAdjacent;
 #endif
 			dialIntent.SetFlags(flags);
 
diff --git a/src/Essentials/src/Platform/Platform.android.cs b/src/Essentials/src/Platform/Platform.android.cs
index 00effac4735a..d5b72f7fbc09 100644
--- a/src/Essentials/src/Platform/Platform.android.cs
+++ b/src/Essentials/src/Platform/Platform.android.cs
@@ -209,8 +209,8 @@ internal static bool HasApiLevel(int apiLevel) =>
 			AppContext.GetSystemService(Context.PowerService) as PowerManager;
 
 #if __ANDROID_25__
-        internal static ShortcutManager ShortcutManager =>
-            AppContext.GetSystemService(Context.ShortcutService) as ShortcutManager;
+		internal static ShortcutManager ShortcutManager =>
+			AppContext.GetSystemService(Context.ShortcutService) as ShortcutManager;
 #endif
 
 		internal static IWindowManager WindowManager =>
@@ -224,8 +224,8 @@ internal static Java.Util.Locale GetLocale()
 			var resources = AppContext.Resources;
 			var config = resources.Configuration;
 #if __ANDROID_24__
-            if (HasApiLevelN)
-                return config.Locales.Get(0);
+			if (HasApiLevelN)
+				return config.Locales.Get(0);
 #endif
 
 #pragma warning disable CS0618 // Type or member is obsolete
@@ -240,9 +240,9 @@ internal static void SetLocale(Java.Util.Locale locale)
 			var config = resources.Configuration;
 
 #if __ANDROID_24__
-            if (HasApiLevelN)
-                config.SetLocale(locale);
-            else
+			if (HasApiLevelN)
+				config.SetLocale(locale);
+			else
 #endif
 #pragma warning disable CS0618 // Type or member is obsolete
 			config.Locale = locale;
diff --git a/src/Essentials/src/Platform/Platform.ios.tvos.watchos.cs b/src/Essentials/src/Platform/Platform.ios.tvos.watchos.cs
index c5f88608cb05..a9dcf1adaa7f 100644
--- a/src/Essentials/src/Platform/Platform.ios.tvos.watchos.cs
+++ b/src/Essentials/src/Platform/Platform.ios.tvos.watchos.cs
@@ -18,27 +18,27 @@ namespace Microsoft.Maui.Essentials
 	public static partial class Platform
 	{
 #if __IOS__ || __TVOS__
-        public static bool OpenUrl(UIApplication app, NSUrl url, NSDictionary options)
-            => WebAuthenticator.OpenUrl(new Uri(url.AbsoluteString));
+		public static bool OpenUrl(UIApplication app, NSUrl url, NSDictionary options)
+			=> WebAuthenticator.OpenUrl(new Uri(url.AbsoluteString));
 
-        public static bool ContinueUserActivity(UIApplication application, NSUserActivity userActivity, UIApplicationRestorationHandler completionHandler)
-            => WebAuthenticator.OpenUrl(new Uri(userActivity?.WebPageUrl?.AbsoluteString));
+		public static bool ContinueUserActivity(UIApplication application, NSUserActivity userActivity, UIApplicationRestorationHandler completionHandler)
+			=> WebAuthenticator.OpenUrl(new Uri(userActivity?.WebPageUrl?.AbsoluteString));
 #endif
 
 #if __IOS__
-        public static void PerformActionForShortcutItem(UIApplication application, UIApplicationShortcutItem shortcutItem, UIOperationHandler completionHandler)
-        {
-            if (shortcutItem.Type == AppActions.Type)
-            {
-                var appAction = shortcutItem.ToAppAction();
-
-                AppActions.InvokeOnAppAction(application, shortcutItem.ToAppAction());
-            }
-        }
+		public static void PerformActionForShortcutItem(UIApplication application, UIApplicationShortcutItem shortcutItem, UIOperationHandler completionHandler)
+		{
+			if (shortcutItem.Type == AppActions.Type)
+			{
+				var appAction = shortcutItem.ToAppAction();
+
+				AppActions.InvokeOnAppAction(application, shortcutItem.ToAppAction());
+			}
+		}
 #endif
 
 #if __IOS__
-        [DllImport(Constants.SystemLibrary, EntryPoint = "sysctlbyname")]
+		[DllImport(Constants.SystemLibrary, EntryPoint = "sysctlbyname")]
 #else
 		[DllImport(Constants.libSystemLibrary, EntryPoint = "sysctlbyname")]
 #endif
@@ -73,67 +73,67 @@ internal static bool HasOSVersion(int major, int minor) =>
 
 #if __IOS__ || __TVOS__
 
-        public static UIViewController GetCurrentUIViewController() =>
-            GetCurrentViewController(false);
-
-        internal static UIViewController GetCurrentViewController(bool throwIfNull = true)
-        {
-            UIViewController viewController = null;
+		public static UIViewController GetCurrentUIViewController() =>
+			GetCurrentViewController(false);
 
-            var window = UIApplication.SharedApplication.KeyWindow;
+		internal static UIViewController GetCurrentViewController(bool throwIfNull = true)
+		{
+			UIViewController viewController = null;
 
-            if (window != null && window.WindowLevel == UIWindowLevel.Normal)
-                viewController = window.RootViewController;
+			var window = UIApplication.SharedApplication.KeyWindow;
 
-            if (viewController == null)
-            {
-                window = UIApplication.SharedApplication
-                    .Windows
-                    .OrderByDescending(w => w.WindowLevel)
-                    .FirstOrDefault(w => w.RootViewController != null && w.WindowLevel == UIWindowLevel.Normal);
+			if (window != null && window.WindowLevel == UIWindowLevel.Normal)
+				viewController = window.RootViewController;
 
-                if (window == null && throwIfNull)
-                    throw new InvalidOperationException("Could not find current view controller.");
-                else
-                    viewController = window?.RootViewController;
-            }
+			if (viewController == null)
+			{
+				window = UIApplication.SharedApplication
+					.Windows
+					.OrderByDescending(w => w.WindowLevel)
+					.FirstOrDefault(w => w.RootViewController != null && w.WindowLevel == UIWindowLevel.Normal);
+
+				if (window == null && throwIfNull)
+					throw new InvalidOperationException("Could not find current view controller.");
+				else
+					viewController = window?.RootViewController;
+			}
 
-            while (viewController?.PresentedViewController != null)
-                viewController = viewController.PresentedViewController;
+			while (viewController?.PresentedViewController != null)
+				viewController = viewController.PresentedViewController;
 
-            if (throwIfNull && viewController == null)
-                throw new InvalidOperationException("Could not find current view controller.");
+			if (throwIfNull && viewController == null)
+				throw new InvalidOperationException("Could not find current view controller.");
 
-            return viewController;
-        }
+			return viewController;
+		}
 
-        internal static UIWindow GetCurrentWindow(bool throwIfNull = true)
-        {
-            var window = UIApplication.SharedApplication.KeyWindow;
+		internal static UIWindow GetCurrentWindow(bool throwIfNull = true)
+		{
+			var window = UIApplication.SharedApplication.KeyWindow;
 
-            if (window != null && window.WindowLevel == UIWindowLevel.Normal)
-                return window;
+			if (window != null && window.WindowLevel == UIWindowLevel.Normal)
+				return window;
 
-            if (window == null)
-            {
-                window = UIApplication.SharedApplication
-                    .Windows
-                    .OrderByDescending(w => w.WindowLevel)
-                    .FirstOrDefault(w => w.RootViewController != null && w.WindowLevel == UIWindowLevel.Normal);
-            }
+			if (window == null)
+			{
+				window = UIApplication.SharedApplication
+					.Windows
+					.OrderByDescending(w => w.WindowLevel)
+					.FirstOrDefault(w => w.RootViewController != null && w.WindowLevel == UIWindowLevel.Normal);
+			}
 
-            if (throwIfNull && window == null)
-                throw new InvalidOperationException("Could not find current window.");
+			if (throwIfNull && window == null)
+				throw new InvalidOperationException("Could not find current window.");
 
-            return window;
-        }
+			return window;
+		}
 #endif
 
 #if __IOS__ || __WATCHOS__
-        static CMMotionManager motionManager;
+		static CMMotionManager motionManager;
 
-        internal static CMMotionManager MotionManager =>
-            motionManager ?? (motionManager = new CMMotionManager());
+		internal static CMMotionManager MotionManager =>
+			motionManager ?? (motionManager = new CMMotionManager());
 #endif
 
 		internal static NSOperationQueue GetCurrentQueue() =>
diff --git a/src/Essentials/src/Sms/Sms.android.cs b/src/Essentials/src/Sms/Sms.android.cs
index e40ef59015f7..85269ca4e19c 100644
--- a/src/Essentials/src/Sms/Sms.android.cs
+++ b/src/Essentials/src/Sms/Sms.android.cs
@@ -22,8 +22,8 @@ static Task PlatformComposeAsync(SmsMessage message)
 
 			var flags = ActivityFlags.ClearTop | ActivityFlags.NewTask;
 #if __ANDROID_24__
-            if (Platform.HasApiLevelN)
-                flags |= ActivityFlags.LaunchAdjacent;
+			if (Platform.HasApiLevelN)
+				flags |= ActivityFlags.LaunchAdjacent;
 #endif
 			intent.SetFlags(flags);
 
diff --git a/src/Essentials/src/Types/LocationExtensions.android.cs b/src/Essentials/src/Types/LocationExtensions.android.cs
index fa57b3844381..dbc092385f8a 100644
--- a/src/Essentials/src/Types/LocationExtensions.android.cs
+++ b/src/Essentials/src/Types/LocationExtensions.android.cs
@@ -30,7 +30,7 @@ internal static Location ToLocation(this AndroidLocation location) =>
 				Accuracy = location.HasAccuracy ? location.Accuracy : default(float?),
 				VerticalAccuracy =
 #if __ANDROID_26__
-                    Platform.HasApiLevelO && location.HasVerticalAccuracy ? location.VerticalAccuracyMeters : default(float?),
+					Platform.HasApiLevelO && location.HasVerticalAccuracy ? location.VerticalAccuracyMeters : default(float?),
 #else
 					default(float?),
 #endif
diff --git a/src/Essentials/src/Vibration/Vibration.android.cs b/src/Essentials/src/Vibration/Vibration.android.cs
index ee57967a099c..f34bb3947f88 100644
--- a/src/Essentials/src/Vibration/Vibration.android.cs
+++ b/src/Essentials/src/Vibration/Vibration.android.cs
@@ -16,11 +16,11 @@ static void PlatformVibrate(TimeSpan duration)
 
 			var time = (long)duration.TotalMilliseconds;
 #if __ANDROID_26__
-            if (Platform.HasApiLevelO)
-            {
-                Platform.Vibrator.Vibrate(VibrationEffect.CreateOneShot(time, VibrationEffect.DefaultAmplitude));
-                return;
-            }
+			if (Platform.HasApiLevelO)
+			{
+				Platform.Vibrator.Vibrate(VibrationEffect.CreateOneShot(time, VibrationEffect.DefaultAmplitude));
+				return;
+			}
 #endif
 
 #pragma warning disable CS0618 // Type or member is obsolete
diff --git a/src/Essentials/src/WebAuthenticator/WebAuthenticator.ios.tvos.cs b/src/Essentials/src/WebAuthenticator/WebAuthenticator.ios.tvos.cs
index cb9f826e8f61..e69ef4bb1a34 100644
--- a/src/Essentials/src/WebAuthenticator/WebAuthenticator.ios.tvos.cs
+++ b/src/Essentials/src/WebAuthenticator/WebAuthenticator.ios.tvos.cs
@@ -15,16 +15,16 @@ namespace Microsoft.Maui.Essentials
 	public static partial class WebAuthenticator
 	{
 #if __IOS__
-        [System.Runtime.InteropServices.DllImport(ObjCRuntime.Constants.ObjectiveCLibrary, EntryPoint = "objc_msgSend")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Required for iOS Export")]
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:Element should begin with upper-case letter", Justification = "Required for iOS Export")]
-        static extern void void_objc_msgSend_IntPtr(IntPtr receiver, IntPtr selector, IntPtr arg1);
+		[System.Runtime.InteropServices.DllImport(ObjCRuntime.Constants.ObjectiveCLibrary, EntryPoint = "objc_msgSend")]
+		[System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Required for iOS Export")]
+		[System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:Element should begin with upper-case letter", Justification = "Required for iOS Export")]
+		static extern void void_objc_msgSend_IntPtr(IntPtr receiver, IntPtr selector, IntPtr arg1);
 
-        const int asWebAuthenticationSessionErrorCodeCanceledLogin = 1;
-        const string asWebAuthenticationSessionErrorDomain = "com.apple.AuthenticationServices.WebAuthenticationSession";
+		const int asWebAuthenticationSessionErrorCodeCanceledLogin = 1;
+		const string asWebAuthenticationSessionErrorDomain = "com.apple.AuthenticationServices.WebAuthenticationSession";
 
-        const int sfAuthenticationErrorCanceledLogin = 1;
-        const string sfAuthenticationErrorDomain = "com.apple.SafariServices.Authentication";
+		const int sfAuthenticationErrorCanceledLogin = 1;
+		const string sfAuthenticationErrorDomain = "com.apple.SafariServices.Authentication";
 #endif
 
 		static TaskCompletionSource<WebAuthenticatorResult> tcsResponse;
@@ -32,8 +32,8 @@ public static partial class WebAuthenticator
 		static Uri redirectUri;
 
 #if __IOS__
-        static ASWebAuthenticationSession was;
-        static SFAuthenticationSession sf;
+		static ASWebAuthenticationSession was;
+		static SFAuthenticationSession sf;
 #endif
 
 		internal static async Task<WebAuthenticatorResult> PlatformAuthenticateAsync(Uri url, Uri callbackUrl)
@@ -50,64 +50,64 @@ internal static async Task<WebAuthenticatorResult> PlatformAuthenticateAsync(Uri
 			var scheme = redirectUri.Scheme;
 
 #if __IOS__
-            static void AuthSessionCallback(NSUrl cbUrl, NSError error)
-            {
-                if (error == null)
-                    OpenUrl(cbUrl);
-                else if (error.Domain == asWebAuthenticationSessionErrorDomain && error.Code == asWebAuthenticationSessionErrorCodeCanceledLogin)
-                    tcsResponse.TrySetCanceled();
-                else if (error.Domain == sfAuthenticationErrorDomain && error.Code == sfAuthenticationErrorCanceledLogin)
-                    tcsResponse.TrySetCanceled();
-                else
-                    tcsResponse.TrySetException(new NSErrorException(error));
-
-                was = null;
-                sf = null;
-            }
-
-            if (UIDevice.CurrentDevice.CheckSystemVersion(12, 0))
-            {
-                was = new ASWebAuthenticationSession(WebUtils.GetNativeUrl(url), scheme, AuthSessionCallback);
-
-                if (UIDevice.CurrentDevice.CheckSystemVersion(13, 0))
-                {
-                    var ctx = new ContextProvider(Platform.GetCurrentWindow());
-                    void_objc_msgSend_IntPtr(was.Handle, ObjCRuntime.Selector.GetHandle("setPresentationContextProvider:"), ctx.Handle);
-                }
-
-                using (was)
-                {
-                    was.Start();
-                    return await tcsResponse.Task;
-                }
-            }
-
-            if (UIDevice.CurrentDevice.CheckSystemVersion(11, 0))
-            {
-                sf = new SFAuthenticationSession(WebUtils.GetNativeUrl(url), scheme, AuthSessionCallback);
-                using (sf)
-                {
-                    sf.Start();
-                    return await tcsResponse.Task;
-                }
-            }
-
-            // This is only on iOS9+ but we only support 10+ in Essentials anyway
-            var controller = new SFSafariViewController(WebUtils.GetNativeUrl(url), false)
-            {
-                Delegate = new NativeSFSafariViewControllerDelegate
-                {
-                    DidFinishHandler = (svc) =>
-                    {
-                        // Cancel our task if it wasn't already marked as completed
-                        if (!(tcsResponse?.Task?.IsCompleted ?? true))
-                            tcsResponse.TrySetCanceled();
-                    }
-                },
-            };
-
-            currentViewController = controller;
-            await Platform.GetCurrentUIViewController().PresentViewControllerAsync(controller, true);
+			static void AuthSessionCallback(NSUrl cbUrl, NSError error)
+			{
+				if (error == null)
+					OpenUrl(cbUrl);
+				else if (error.Domain == asWebAuthenticationSessionErrorDomain && error.Code == asWebAuthenticationSessionErrorCodeCanceledLogin)
+					tcsResponse.TrySetCanceled();
+				else if (error.Domain == sfAuthenticationErrorDomain && error.Code == sfAuthenticationErrorCanceledLogin)
+					tcsResponse.TrySetCanceled();
+				else
+					tcsResponse.TrySetException(new NSErrorException(error));
+
+				was = null;
+				sf = null;
+			}
+
+			if (UIDevice.CurrentDevice.CheckSystemVersion(12, 0))
+			{
+				was = new ASWebAuthenticationSession(WebUtils.GetNativeUrl(url), scheme, AuthSessionCallback);
+
+				if (UIDevice.CurrentDevice.CheckSystemVersion(13, 0))
+				{
+					var ctx = new ContextProvider(Platform.GetCurrentWindow());
+					void_objc_msgSend_IntPtr(was.Handle, ObjCRuntime.Selector.GetHandle("setPresentationContextProvider:"), ctx.Handle);
+				}
+
+				using (was)
+				{
+					was.Start();
+					return await tcsResponse.Task;
+				}
+			}
+
+			if (UIDevice.CurrentDevice.CheckSystemVersion(11, 0))
+			{
+				sf = new SFAuthenticationSession(WebUtils.GetNativeUrl(url), scheme, AuthSessionCallback);
+				using (sf)
+				{
+					sf.Start();
+					return await tcsResponse.Task;
+				}
+			}
+
+			// This is only on iOS9+ but we only support 10+ in Essentials anyway
+			var controller = new SFSafariViewController(WebUtils.GetNativeUrl(url), false)
+			{
+				Delegate = new NativeSFSafariViewControllerDelegate
+				{
+					DidFinishHandler = (svc) =>
+					{
+						// Cancel our task if it wasn't already marked as completed
+						if (!(tcsResponse?.Task?.IsCompleted ?? true))
+							tcsResponse.TrySetCanceled();
+					}
+				},
+			};
+
+			currentViewController = controller;
+			await Platform.GetCurrentUIViewController().PresentViewControllerAsync(controller, true);
 #else
 			var opened = UIApplication.SharedApplication.OpenUrl(url);
 			if (!opened)
@@ -152,26 +152,26 @@ static bool VerifyHasUrlSchemeOrDoesntRequire(string scheme)
 		}
 
 #if __IOS__
-        class NativeSFSafariViewControllerDelegate : SFSafariViewControllerDelegate
-        {
-            public Action<SFSafariViewController> DidFinishHandler { get; set; }
-
-            public override void DidFinish(SFSafariViewController controller) =>
-                DidFinishHandler?.Invoke(controller);
-        }
-
-        [ObjCRuntime.Adopts("ASWebAuthenticationPresentationContextProviding")]
-        class ContextProvider : NSObject
-        {
-            public ContextProvider(UIWindow window) =>
-                Window = window;
-
-            public UIWindow Window { get; private set; }
-
-            [Export("presentationAnchorForWebAuthenticationSession:")]
-            public UIWindow GetPresentationAnchor(ASWebAuthenticationSession session)
-                => Window;
-        }
+		class NativeSFSafariViewControllerDelegate : SFSafariViewControllerDelegate
+		{
+			public Action<SFSafariViewController> DidFinishHandler { get; set; }
+
+			public override void DidFinish(SFSafariViewController controller) =>
+				DidFinishHandler?.Invoke(controller);
+		}
+
+		[ObjCRuntime.Adopts("ASWebAuthenticationPresentationContextProviding")]
+		class ContextProvider : NSObject
+		{
+			public ContextProvider(UIWindow window) =>
+				Window = window;
+
+			public UIWindow Window { get; private set; }
+
+			[Export("presentationAnchorForWebAuthenticationSession:")]
+			public UIWindow GetPresentationAnchor(ASWebAuthenticationSession session)
+				=> Window;
+		}
 #endif
 	}
 }
diff --git a/src/Essentials/test/DeviceTests.Shared/Essentials.DeviceTests.Shared.csproj b/src/Essentials/test/DeviceTests.Shared/Essentials.DeviceTests.Shared.csproj
index 32ee56b40752..0c14225a1a0f 100644
--- a/src/Essentials/test/DeviceTests.Shared/Essentials.DeviceTests.Shared.csproj
+++ b/src/Essentials/test/DeviceTests.Shared/Essentials.DeviceTests.Shared.csproj
@@ -2,6 +2,8 @@
   <PropertyGroup>
     <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">Xamarin.iOS10;MonoAndroid10.0;uap10.0.16299</TargetFrameworks>
     <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">Xamarin.iOS10;MonoAndroid10.0;</TargetFrameworks>
+    <TargetFrameworks Condition="'$(BuildNonNet6ForAndroid)' == 'true'">MonoAndroid10.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(BuildNonNet6ForiOS)' == 'true'">Xamarin.iOS10</TargetFrameworks>
     <AssemblyName>EssentialsDeviceTestsShared</AssemblyName>
     <RootNamespace>Microsoft.Maui.Essentials.DeviceTests.Shared</RootNamespace>
     <Product>$(AssemblyName) ($(TargetFramework))</Product>
diff --git a/src/Essentials/test/DeviceTests.Shared/HardwareSupport.cs b/src/Essentials/test/DeviceTests.Shared/HardwareSupport.cs
index 5aa15a0d466f..1f089e0c729a 100644
--- a/src/Essentials/test/DeviceTests.Shared/HardwareSupport.cs
+++ b/src/Essentials/test/DeviceTests.Shared/HardwareSupport.cs
@@ -4,86 +4,86 @@ static class HardwareSupport
 	{
 		public static bool HasAccelerometer =>
 #if __ANDROID__
-            // android emulates the accelerometer
-            true;
+			// android emulates the accelerometer
+			true;
 #elif __IOS__
-            // all iOS devices (and only devices) have an accelerometer
-            Microsoft.Maui.Essentials.DeviceInfo.DeviceType == Microsoft.Maui.Essentials.DeviceType.Physical;
+			// all iOS devices (and only devices) have an accelerometer
+			Microsoft.Maui.Essentials.DeviceInfo.DeviceType == Microsoft.Maui.Essentials.DeviceType.Physical;
 #elif WINDOWS_UWP
-            // UWP does not emulate, and only some devices have, an accelerometer
-            Windows.Devices.Sensors.Accelerometer.GetDefault() != null;
+			// UWP does not emulate, and only some devices have, an accelerometer
+			Windows.Devices.Sensors.Accelerometer.GetDefault() != null;
 #endif
 
 		public static bool HasMagnetometer =>
 #if __ANDROID__
-            // android emulates the magnetometer
-            true;
+			// android emulates the magnetometer
+			true;
 #elif __IOS__
-            // all iOS devices (and only devices) have a magnetometer
-            Microsoft.Maui.Essentials.DeviceInfo.DeviceType == Microsoft.Maui.Essentials.DeviceType.Physical;
+			// all iOS devices (and only devices) have a magnetometer
+			Microsoft.Maui.Essentials.DeviceInfo.DeviceType == Microsoft.Maui.Essentials.DeviceType.Physical;
 #elif WINDOWS_UWP
-            // UWP does not emulate, and only some devices have, a magnetometer
-            Windows.Devices.Sensors.Magnetometer.GetDefault() != null;
+			// UWP does not emulate, and only some devices have, a magnetometer
+			Windows.Devices.Sensors.Magnetometer.GetDefault() != null;
 #endif
 
 		public static bool HasGyroscope =>
 #if __ANDROID__
-            // Android emulators and devices have gyros
-            Microsoft.Maui.Essentials.Platform.SensorManager?.GetDefaultSensor(Android.Hardware.SensorType.Gyroscope) != null;
+			// Android emulators and devices have gyros
+			Microsoft.Maui.Essentials.Platform.SensorManager?.GetDefaultSensor(Android.Hardware.SensorType.Gyroscope) != null;
 #elif __IOS__
-            // all iOS devices (and only devices) have a gyroscope
-            Microsoft.Maui.Essentials.DeviceInfo.DeviceType == Microsoft.Maui.Essentials.DeviceType.Physical;
+			// all iOS devices (and only devices) have a gyroscope
+			Microsoft.Maui.Essentials.DeviceInfo.DeviceType == Microsoft.Maui.Essentials.DeviceType.Physical;
 #elif WINDOWS_UWP
-            // UWP does not emulate, and only some devices have, a gyroscope
-            Windows.Devices.Sensors.Gyrometer.GetDefault() != null;
+			// UWP does not emulate, and only some devices have, a gyroscope
+			Windows.Devices.Sensors.Gyrometer.GetDefault() != null;
 #endif
 
 		public static bool HasCompass =>
 #if __ANDROID__
-            // android emulates the compass
-            true;
+			// android emulates the compass
+			true;
 #elif __IOS__
-            // all iOS devices (and only devices) have a compass
-            Microsoft.Maui.Essentials.DeviceInfo.DeviceType == Microsoft.Maui.Essentials.DeviceType.Physical;
+			// all iOS devices (and only devices) have a compass
+			Microsoft.Maui.Essentials.DeviceInfo.DeviceType == Microsoft.Maui.Essentials.DeviceType.Physical;
 #elif WINDOWS_UWP
-            // UWP does not emulate, and only some devices have, a compass
-            Windows.Devices.Sensors.Compass.GetDefault() != null;
+			// UWP does not emulate, and only some devices have, a compass
+			Windows.Devices.Sensors.Compass.GetDefault() != null;
 #endif
 
 		public static bool HasBattery =>
 #if __ANDROID__
-            // android emulates the battery
-            true;
+			// android emulates the battery
+			true;
 #elif __IOS__
-            // all iOS devices (and only devices) have a battery
-            Microsoft.Maui.Essentials.DeviceInfo.DeviceType == Microsoft.Maui.Essentials.DeviceType.Physical;
+			// all iOS devices (and only devices) have a battery
+			Microsoft.Maui.Essentials.DeviceInfo.DeviceType == Microsoft.Maui.Essentials.DeviceType.Physical;
 #elif WINDOWS_UWP
-            // UWP appears to emulate a battery
-            // TODO: verify this
-            true;
+			// UWP appears to emulate a battery
+			// TODO: verify this
+			true;
 #endif
 
 		public static bool HasFlash =>
 #if __ANDROID__
-            // TODO: android emulates the lamp, I think...
-            Microsoft.Maui.Essentials.Platform.HasSystemFeature(Android.Content.PM.PackageManager.FeatureCameraFlash);
+			// TODO: android emulates the lamp, I think...
+			Microsoft.Maui.Essentials.Platform.HasSystemFeature(Android.Content.PM.PackageManager.FeatureCameraFlash);
 #elif __IOS__
-            // all iOS devices (and only devices) have a camera
-            Microsoft.Maui.Essentials.DeviceInfo.DeviceType == Microsoft.Maui.Essentials.DeviceType.Physical;
+			// all iOS devices (and only devices) have a camera
+			Microsoft.Maui.Essentials.DeviceInfo.DeviceType == Microsoft.Maui.Essentials.DeviceType.Physical;
 #elif WINDOWS_UWP
-            // TODO: most UWP devices don't have a camera lamp (mobile devices do, we we don't care about those)
-            false;
+			// TODO: most UWP devices don't have a camera lamp (mobile devices do, we we don't care about those)
+			false;
 #endif
 
 		public static bool HasBarometer =>
 #if __ANDROID__
-            true;
+			true;
 #elif __IOS__
-            // iphone 6 and never have a barometer. looking in how to test this.
-            Microsoft.Maui.Essentials.DeviceInfo.DeviceType == Microsoft.Maui.Essentials.DeviceType.Physical;
+			// iphone 6 and never have a barometer. looking in how to test this.
+			Microsoft.Maui.Essentials.DeviceInfo.DeviceType == Microsoft.Maui.Essentials.DeviceType.Physical;
 #elif WINDOWS_UWP
-            // TODO: most UWP devices don't have a barometer (mobile devices do, we we don't care about those)
-            false;
+			// TODO: most UWP devices don't have a barometer (mobile devices do, we we don't care about those)
+			false;
 #endif
 	}
 }
diff --git a/src/SingleProject/Resizetizer/src/GenerateSplashAndroidResources.cs b/src/SingleProject/Resizetizer/src/GenerateSplashAndroidResources.cs
index 9734f85780be..2de1a74766b6 100644
--- a/src/SingleProject/Resizetizer/src/GenerateSplashAndroidResources.cs
+++ b/src/SingleProject/Resizetizer/src/GenerateSplashAndroidResources.cs
@@ -32,7 +32,7 @@ public override bool Execute()
 		const string Namespace = "http://schemas.android.com/apk/res/android";
 		const string Comment = "This file was auto-generated by .NET MAUI.";
 
-		void WriteColors (ITaskItem splash)
+		void WriteColors(ITaskItem splash)
 		{
 			Directory.CreateDirectory(Path.GetDirectoryName(ColorsFile));
 
@@ -57,7 +57,7 @@ void WriteColors (ITaskItem splash)
 			writer.WriteEndDocument();
 		}
 
-		void WriteDrawable (ITaskItem splash)
+		void WriteDrawable(ITaskItem splash)
 		{
 			Directory.CreateDirectory(Path.GetDirectoryName(DrawableFile));
 
diff --git a/src/SingleProject/Resizetizer/src/GetMauiAssetPath.cs b/src/SingleProject/Resizetizer/src/GetMauiAssetPath.cs
new file mode 100644
index 000000000000..293f525df96e
--- /dev/null
+++ b/src/SingleProject/Resizetizer/src/GetMauiAssetPath.cs
@@ -0,0 +1,88 @@
+using System;
+using System.IO;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+
+namespace Microsoft.Maui.Resizetizer
+{
+	/// <summary>
+	/// Takes the incoming @(MauiAsset) item group, and returns the proper metadata to include it in the app.
+	/// The main reason we need a task for this is to preserve directory structure.
+	/// 
+	/// Some examples:
+	/// Resources\foo.mp3 -> Resources\foo.mp3
+	/// C:\src\code\MyProject\Resources\foo.mp3 -> Resources\foo.mp3
+	/// C:\some\random\path\foo.mp3 -> foo.mp3
+	/// </summary>
+	public class GetMauiAssetPath : Task
+	{
+		/// <summary>
+		/// The value for $(MSBuildProjectDirectory) in the current project
+		/// </summary>
+		[Required]
+		public string ProjectDirectory { get; set; }
+
+		/// <summary>
+		/// On Windows, 'Assets/' is prepended to the path
+		/// </summary>
+		public string FolderName { get; set; }
+
+		/// <summary>
+		/// On Windows, %(TargetPath) is passed in, %(Link) by default for other platforms
+		/// </summary>
+		public string ItemMetadata { get; set; } = "Link";
+
+		public ITaskItem[] Input { get; set; }
+
+		[Output]
+		public ITaskItem[] Output { get; set; }
+
+		public override bool Execute()
+		{
+			if (Input != null && Input.Length > 0)
+			{
+				foreach (var item in Input)
+				{
+					var link = item.GetMetadata("Link");
+					var path = string.IsNullOrEmpty(link) ? item.ItemSpec : link;
+					if (Path.IsPathRooted(path))
+					{
+						path = Path.GetFullPath(path);
+						if (!MakeRelative (item.GetMetadata("ProjectDirectory"), ref path) && !MakeRelative (ProjectDirectory, ref path))
+						{
+							// If this is a random path, the best we can do is use the file name
+							path = Path.GetFileName(path);
+						}
+					}
+					// Prepend FolderName if not blank
+					if (!string.IsNullOrEmpty(FolderName))
+					{
+						path = Path.Combine(FolderName, path);
+					}
+					item.SetMetadata(ItemMetadata, path);
+				}
+				Output = Input;
+			}
+
+			return !Log.HasLoggedErrors;
+		}
+
+		static bool MakeRelative (string projectDirectory, ref string path)
+		{
+			if (string.IsNullOrEmpty(projectDirectory))
+				return false;
+
+			projectDirectory = Path.GetFullPath(projectDirectory);
+			if (!projectDirectory.EndsWith(Path.DirectorySeparatorChar.ToString()))
+			{
+				projectDirectory += Path.DirectorySeparatorChar;
+			}
+			if (path.StartsWith(projectDirectory, StringComparison.OrdinalIgnoreCase))
+			{
+				path = path.Substring(projectDirectory.Length);
+				return true;
+			}
+			return false;
+		}
+	}
+}
diff --git a/src/SingleProject/Resizetizer/test/UnitTests/GenerateSplashAndroidResourcesTests.cs b/src/SingleProject/Resizetizer/test/UnitTests/GenerateSplashAndroidResourcesTests.cs
index a36eac9d12a6..9b90364480ea 100644
--- a/src/SingleProject/Resizetizer/test/UnitTests/GenerateSplashAndroidResourcesTests.cs
+++ b/src/SingleProject/Resizetizer/test/UnitTests/GenerateSplashAndroidResourcesTests.cs
@@ -37,7 +37,7 @@ void AssertFile(string actualPath, params object[] args)
 		}
 
 		[Theory]
-		[InlineData ("#abcdef", "#ffabcdef")]
+		[InlineData("#abcdef", "#ffabcdef")]
 		[InlineData("Red", "#ffff0000")]
 		public void XmlIsValid(string inputColor, string outputColor)
 		{
diff --git a/src/SingleProject/Resizetizer/test/UnitTests/GetMauiAssetsPathTests.cs b/src/SingleProject/Resizetizer/test/UnitTests/GetMauiAssetsPathTests.cs
new file mode 100644
index 000000000000..6218ab1bd1d8
--- /dev/null
+++ b/src/SingleProject/Resizetizer/test/UnitTests/GetMauiAssetsPathTests.cs
@@ -0,0 +1,80 @@
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+using Xunit;
+
+namespace Microsoft.Maui.Resizetizer.Tests
+{
+	public class GetMauiAssetsPathTests : MSBuildTaskTestFixture<GetMauiAssetPath>
+	{
+		const string ProjectDirectory = @"C:\src\code\MyProject";
+		const string LibraryProjectDirectory = ProjectDirectory + @"\ClassLibrary1";
+
+		protected GetMauiAssetPath GetNewTask(string folderName, params ITaskItem[] input) => new()
+		{
+			ProjectDirectory = ProjectDirectory,
+			FolderName = folderName,
+			Input = input
+		};
+
+		[Theory]
+		[InlineData("foo.mp3", "foo.mp3")]
+		[InlineData("foo.mp3", @"Assets\foo.mp3", "Assets")]
+		[InlineData("Resources/Assets/foo.mp3", "Resources/Assets/foo.mp3")]
+		[InlineData(@"Resources\Assets\foo.mp3", @"Resources\Assets\foo.mp3")]
+		[InlineData(ProjectDirectory + @"\foo.mp3", "foo.mp3")]
+		[InlineData(ProjectDirectory + @"\foo.mp3", @"Assets\foo.mp3", "Assets")]
+		public void LinkMetadataIsBlank(string input, string output, string folderName = null)
+		{
+			var item = new TaskItem(input);
+			var task = GetNewTask(folderName, item);
+			var success = task.Execute();
+			Assert.True(success, $"{task.GetType()}.Execute() failed.");
+			Assert.Equal(output, task.Output[0].GetMetadata("Link"));
+		}
+
+		[Theory]
+		[InlineData(@"C:\Program Files\foo.mp3", "foo.mp3", "foo.mp3")]
+		[InlineData(@"C:\Program Files\foo.mp3", "foo.mp3", @"Assets\foo.mp3", "Assets")]
+		[InlineData("/Resources/Assets/foo.mp3", "Resources/Assets/foo.mp3", "Resources/Assets/foo.mp3")]
+		[InlineData(@"C:\Resources\Assets\foo.mp3", @"Resources\Assets\foo.mp3", @"Resources\Assets\foo.mp3")]
+		[InlineData("foo.mp3", ProjectDirectory + @"\foo.mp3", "foo.mp3")]
+		[InlineData("foo.mp3", ProjectDirectory + @"\foo.mp3", @"Assets\foo.mp3", "Assets")]
+		public void UseLinkMetadata(string input, string link, string output, string folderName = null)
+		{
+			var item = new TaskItem(input);
+			item.SetMetadata("Link", link);
+			var task = GetNewTask(folderName, item);
+			var success = task.Execute();
+			Assert.True(success, $"{task.GetType()}.Execute() failed.");
+			Assert.Equal(output, task.Output[0].GetMetadata("Link"));
+		}
+
+		[Theory]
+		[InlineData("foo.mp3", "foo.mp3")]
+		[InlineData("foo.mp3", @"Assets\foo.mp3", "Assets")]
+		public void UseTargetPath(string input, string output, string folderName = null)
+		{
+			var item = new TaskItem(input);
+			var task = GetNewTask(folderName, item);
+			task.ItemMetadata = "TargetPath";
+			var success = task.Execute();
+			Assert.True(success, $"{task.GetType()}.Execute() failed.");
+			Assert.Equal(output, task.Output[0].GetMetadata("TargetPath"));
+		}
+
+		[Theory]
+		[InlineData(LibraryProjectDirectory + @"\foo.mp3", "foo.mp3")]
+		[InlineData(LibraryProjectDirectory + @"\foo.mp3", @"Assets\foo.mp3", "Assets")]
+		[InlineData(LibraryProjectDirectory + @"\foo.mp3", "foo.mp3", null, @"\")]
+		[InlineData(LibraryProjectDirectory + @"\foo.mp3", @"Assets\foo.mp3", "Assets", @"\")]
+		public void UseProjectDirectory(string input, string output, string folderName = null, string suffix = null)
+		{
+			var item = new TaskItem(input);
+			item.SetMetadata("ProjectDirectory", LibraryProjectDirectory + suffix);
+			var task = GetNewTask(folderName, item);
+			var success = task.Execute();
+			Assert.True(success, $"{task.GetType()}.Execute() failed.");
+			Assert.Equal(output, task.Output[0].GetMetadata("Link"));
+		}
+	}
+}
diff --git a/src/SingleProject/Resizetizer/test/UnitTests/ResizetizeImagesTests.cs b/src/SingleProject/Resizetizer/test/UnitTests/ResizetizeImagesTests.cs
index 61f5d4da890a..b9ff175239e0 100644
--- a/src/SingleProject/Resizetizer/test/UnitTests/ResizetizeImagesTests.cs
+++ b/src/SingleProject/Resizetizer/test/UnitTests/ResizetizeImagesTests.cs
@@ -24,7 +24,7 @@ protected ResizetizeImages GetNewTask(string type, params ITaskItem[] items) =>
 				{
 					PlatformType = type,
 					IntermediateOutputPath = DestinationDirectory,
-					InputsFile = "resizetizer.inputs",
+					InputsFile = "mauiimage.inputs",
 					Images = items,
 					BuildEngine = this,
 				};
diff --git a/src/TestUtils/TestUtils.DeviceTests/src/TestUtils.DeviceTests.csproj b/src/TestUtils/TestUtils.DeviceTests/src/TestUtils.DeviceTests.csproj
index d0c20d065177..ed56da091ba8 100644
--- a/src/TestUtils/TestUtils.DeviceTests/src/TestUtils.DeviceTests.csproj
+++ b/src/TestUtils/TestUtils.DeviceTests/src/TestUtils.DeviceTests.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;Xamarin.iOS10;MonoAndroid10.0;</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);uap10.0.16299</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;$(NonNet6Platforms)</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' AND '$(BuildNonNet6ForAndroid)' == 'false' AND '$(BuildNonNet6ForiOS)' == 'false' ">$(TargetFrameworks);uap10.0.16299</TargetFrameworks>
     <RootNamespace>Microsoft.Maui.TestUtils</RootNamespace>
     <AssemblyName>Microsoft.Maui.TestUtils.DeviceTests</AssemblyName>